Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 17:25:54 +0000 (09:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 17:25:54 +0000 (09:25 -0800)
commitd5eebf428ac91ad12d316a391b734670d61480d8
tree2cf868d1e29714250697f03f5da1ac3a5934178c
parent5643f000c1e10ab991182478b76550e1364c3570
parente99f8b5efe78110e4af10f35ebf11feeef8f43b6
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev