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)
commitf1547973af9ba5a65f09c4b12c1598632bf42e95
treee019b2d7c721b32da3f49bc5adae10afa6b08443
parentf4f8a039a1d79a34263c2cbad2c99ade4f82c5b4
parentc1c8c4f91ad5a416bf49a5bd05f5877ccf336ccf
Merge http://linus.bkbits.net:8080/linux-2.5
into hostme.bitkeeper.com:/ua/repos/f/fbdev/fbdev-2.5
drivers/video/aty/atyfb_base.c