]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
authorLinus Torvalds <torvalds@home.osdl.org>
Sun, 4 Jan 2004 10:34:20 +0000 (02:34 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Sun, 4 Jan 2004 10:34:20 +0000 (02:34 -0800)
into home.osdl.org:/home/torvalds/v2.5/linux


Trivial merge