Merge heisenberg.transvirtual.com:/tmp/linus-2.5
authorJames Simmons <jsimmons@heisenberg.transvirtual.com>
Fri, 3 May 2002 02:31:16 +0000 (19:31 -0700)
committerJames Simmons <jsimmons@heisenberg.transvirtual.com>
Fri, 3 May 2002 02:31:16 +0000 (19:31 -0700)
commita2dd1416b40d5285ad6170569b374814cd863587
treee019b2d7c721b32da3f49bc5adae10afa6b08443
parentf4f8a039a1d79a34263c2cbad2c99ade4f82c5b4
parentc1c8c4f91ad5a416bf49a5bd05f5877ccf336ccf
Merge heisenberg.transvirtual.com:/tmp/linus-2.5
into heisenberg.transvirtual.com:/tmp/fbdev-2.5
drivers/video/aty/atyfb_base.c