Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:06:50 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:06:50 +0000 (09:06 -0700)
commit5fadd053d9bb4345ec6f405d24db4e7eb49cf81e
tree73924189ef46511301d004946fbdd9937b00c484
parente5dfa9282f3db461a896a6692b529e1823ba98c6
parent26ba2a7a9f4d8921f095af646a7d22c15a148028
Merge branch 'upstream' of /linux/kernel/git/jgarzik/libata-dev