Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 12:50:36 +0000 (05:50 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 12:50:36 +0000 (05:50 -0700)
commit94f8c66e5e543d79231abf203d6e514ecb668688
tree79f240cb13dd3da5879a7cf52ca1beca4650311d
parentda1f136c26d45c57e8b2d711bf17a6e5ec4de2d1
parentd0bd99299bf933ae006d2dc6a31ffcba482ae3f2
Merge branch 'upstream' of /linux/kernel/git/jgarzik/libata-dev