Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 15 Nov 2005 20:45:33 +0000 (12:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 15 Nov 2005 20:45:33 +0000 (12:45 -0800)
commit7ae8c5ec122e4e909193dbbdb2ad2de349e307c9
tree42ef1a96f9286f8ddab8edd6d037506a9cbe889f
parente1f1def6ef3f0c71d0df302c3759f6937adaf9ae
parent9f68a24853dd37d18f2cfa979cf4e131f5a10e8f
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev