Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:32:33 +0000 (16:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:32:33 +0000 (16:32 -0800)
commit1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6
tree3c8d1716cd53ed77a935036090323a1ae9a7963b
parentd779188d2baf436e67fe8816fca2ef53d246900f
parenta18ceba7b40e24a9da87249bd74f16ea5abd6894
Merge branch 'upstream' of /linux/kernel/git/jgarzik/libata-dev