]> git.neil.brown.name Git - history.git/commitdiff
Merge http://fbdev.bkbits.net/fbdev-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 1 May 2002 05:29:39 +0000 (22:29 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 1 May 2002 05:29:39 +0000 (22:29 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
drivers/video/aty/atyfb_base.c

Simple merge