Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 18:51:01 +0000 (11:51 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 18:51:01 +0000 (11:51 -0700)
commit1b11d78cf87a7014f96e5b7fa2e1233cc8081a00
treecd885281545be78512dddc44fb8f9b76771d0186
parent8920e8f94c44e31a73bdf923b04721e26e88cadd
parent6a690df5c8b37d4a1c41df40770d42d44fac0e97
Merge branch 'upstream' of /linux/kernel/git/jgarzik/libata-dev