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


Trivial merge