]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk/linux-2.5-serial
authorLinus Torvalds <torvalds@home.transmeta.com>
Sat, 19 Apr 2003 09:24:09 +0000 (02:24 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sat, 19 Apr 2003 09:24:09 +0000 (02:24 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/char/tty_io.c

Simple merge