Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Feb 2006 18:11:32 +0000 (10:11 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Feb 2006 18:11:32 +0000 (10:11 -0800)
commit52aa536f5a78bbba9205d296f53d2f8a424a3b08
tree29ccde2430d7dd34420761b7fde4a8c8976fe76c
parent5914811acf36c3ff091f860a6964808f668f27d0
parent2e242fa994428bd1a40b6a7e97430413246d0a16
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev