]> git.hungrycats.org Git - linux/commitdiff
Merge http://gkernel.bkbits.net/misc-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 21 Feb 2002 04:34:13 +0000 (20:34 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 21 Feb 2002 04:34:13 +0000 (20:34 -0800)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
drivers/video/riva/fbdev.c

Simple merge