]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 12 Apr 2004 09:22:59 +0000 (02:22 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 12 Apr 2004 09:22:59 +0000 (02:22 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
drivers/serial/Kconfig

Simple merge