Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 30 Oct 2005 22:47:58 +0000 (14:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 30 Oct 2005 22:47:58 +0000 (14:47 -0800)
commit6e9d6b8ee4e0c37d3952256e6472c57490d6780d
tree39161fdc999565ddb47a55fad57ab6f1b7266b97
parentd3f8cf489993658702b7e58ff37162246263de53
parenta9524a76f70f3343e4be27f95a7e92a8ba5f9009
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev