Merge head 'upstream-20050628-1' of rsync://rsync.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 17:20:11 +0000 (10:20 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 17:20:11 +0000 (10:20 -0700)
commit61998bcb4bf0efa0276e88c7853091e482a826f4
treee01a1cbcc20ca013622fce45a1a056b89a11a40b
parentc36ad397a30fcf9369d82584324cc24189eb6b1c
parent0a139e79976b9eb60517edec63406236a789f812
Merge head 'upstream-20050628-1' of /linux/kernel/git/jgarzik/libata-dev