Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 17 May 2005 15:55:00 +0000 (08:55 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 17 May 2005 15:55:00 +0000 (08:55 -0700)
commitad542ef5b2296fa7a8518e6be67c4588b750d316
treee039ed07c5cd2163dee880cb7970a70333c532aa
parentff96b3d4b840e8aa126e0a60fd743417ffdee178
parentf3ac91cf521be4637236d2dcb7ad4aa91f8865f0
Merge ... /linux/kernel/git/jgarzik/libata-2.6.git