]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 4 May 2004 11:15:55 +0000 (04:15 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 4 May 2004 11:15:55 +0000 (04:15 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge