Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 16:35:50 +0000 (08:35 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 16:35:50 +0000 (08:35 -0800)
commit19da9b8b6ef80e4b1f870c0d270df32571fdaad6
tree7da3f7ff720e6543a1b1d30fe5e38b9a3c53d064
parenta7c243b544c0e9f6775c2607decaa59d54fb9e11
parent7c3983357fdaef3ae71a0d7081a4b6dcfd869d39
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev