Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 20:54:35 +0000 (13:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 20:54:35 +0000 (13:54 -0700)
commit8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4
tree82c0316704804a652f5fc4fe4de14b0a6ab27ba0
parent4f07118f656c179740cad35b827032e2e29b1210
parent70d374ea9907036e15574a5ce89219edd5baee10
Merge refs/heads/upstream from /linux/kernel/git/jgarzik/libata-dev