Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:03:46 +0000 (10:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:03:46 +0000 (10:03 -0700)
commit5be1d85c208f135fc88f972f91b91a879b702b40
tree6ca884e6cd58d596a64ef12fa62405524d6cd5f1
parent69be8f189653cd81aae5a74e26615b12871bb72e
parent135932651fd1eeb95eb6c5d4f6652aae73fe2c24
Merge refs/heads/upstream from /linux/kernel/git/jgarzik/libata-dev