]> git.neil.brown.name Git - history.git/commitdiff
Merge http://fbdev.bkbits.net/fbdev-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 24 Jul 2002 03:45:33 +0000 (20:45 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 24 Jul 2002 03:45:33 +0000 (20:45 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/char/vt.c

Simple merge