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)

Trivial merge