]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://gkernel.bkbits.net/libata-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 13 Nov 2004 12:33:58 +0000 (04:33 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 13 Nov 2004 12:33:58 +0000 (04:33 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge