Merge head 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:04:47 +0000 (09:04 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:04:47 +0000 (09:04 -0700)
commit5a90fa71f6d45054c78b2bd6dbc4feba1638e1d2
tree2d6803ca2d8201500a203465d2afe54187ad0c52
parentdddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76
parent7b6dbd6872ca1d0c03dc0e0a7108d79c8dafa793
Merge head 'upstream' of /linux/kernel/git/jgarzik/libata-dev