]> git.neil.brown.name Git - history.git/commitdiff
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)
into heisenberg.transvirtual.com:/tmp/fbdev-2.5

1  2 
drivers/video/aty/atyfb_base.c

Simple merge