Merge heisenberg.transvirtual.com:/tmp/linus-2.5
authorJames Simmons <jsimmons@heisenberg.transvirtual.com>
Fri, 24 May 2002 06:32:02 +0000 (23:32 -0700)
committerJames Simmons <jsimmons@heisenberg.transvirtual.com>
Fri, 24 May 2002 06:32:02 +0000 (23:32 -0700)
commitd645f0e0d4cf14932a14422bc641bd7b54764ed5
tree16cd5186b05a615874d495a137d1608d607baa25
parent5d652eb5c57cc529e88770d667f1c4630a305220
parente970606bca9034537a0f9948be663bb745744cc6
Merge heisenberg.transvirtual.com:/tmp/linus-2.5
into heisenberg.transvirtual.com:/tmp/fbdev-2.5
drivers/video/Makefile
drivers/video/acornfb.c