]> git.hungrycats.org Git - linux/commitdiff
Merge http://linus.bkbits.net:8080/linux-2.5
authorJames Simmons <fbdev.adm@hostme.bitkeeper.com>
Fri, 3 May 2002 02:14:51 +0000 (19:14 -0700)
committerJames Simmons <fbdev.adm@hostme.bitkeeper.com>
Fri, 3 May 2002 02:14:51 +0000 (19:14 -0700)
into hostme.bitkeeper.com:/ua/repos/f/fbdev/fbdev-2.5

1  2 
drivers/video/aty/atyfb_base.c

Simple merge