Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 21:47:16 +0000 (13:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 21:47:16 +0000 (13:47 -0800)
commit614f8f50ca1361d054cdeca38d241684490d2296
tree25c361fc4aa6139a9d1280b9c46ead3c85468cdb
parent00ab2f3df33dd3e649904765767dd87ffbcb3acf
parentc15d85c8f3f73b5f20aae7928e25b6996f16b328
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev