]> git.hungrycats.org Git - linux/commitdiff
Merge http://linuxconsole.bkbits.net:8080/dev
authorLinus Torvalds <torvalds@home.transmeta.com>
Sun, 14 Jul 2002 11:14:26 +0000 (04:14 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sun, 14 Jul 2002 11:14:26 +0000 (04:14 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/acpi/system.c
drivers/char/tty_io.c

Simple merge
Simple merge