]> git.hungrycats.org Git - linux/commitdiff
Merge bk://gkernel.bkbits.net/libata-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 03:53:07 +0000 (20:53 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 03:53:07 +0000 (20:53 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge