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 00:27:39 +0000 (17:27 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 00:27:39 +0000 (17:27 -0700)
commitcc896f08717c445235554a7963a7b2ecf58911ad
tree1f3bdd0d1b7b503e2344755ff03e0862c8eb9a01
parent87129d96265cebcb1176896746d285b46c2d7b36
parentca20aa6954bcb4537064a1bf5e8f74af57da2a03
Merge branch 'upstream' of /linux/kernel/git/jgarzik/libata-dev