Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
commita8e4f435d9ea38bfe9171d7458b2057d440825b1
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 Aug 2005 05:04:58 +0000 (29 22:04 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 Aug 2005 05:04:58 +0000 (29 22:04 -0700)
tree817ed67ed85f04e821f5ad980fc53ed76fb57d06
parent8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09
parent502c7f1dd566e7ca8aabdb755182664c5fdaebf1
Merge refs/heads/upstream from /linux/kernel/git/jgarzik/libata-dev