Merge heisenberg.transvirtual.com:/tmp/linus-2.5
authorJames Simmons <jsimmons@heisenberg.transvirtual.com>
Fri, 31 May 2002 02:22:39 +0000 (19:22 -0700)
committerJames Simmons <jsimmons@heisenberg.transvirtual.com>
Fri, 31 May 2002 02:22:39 +0000 (19:22 -0700)
commit8364a82670286ca7840e64362690109540e32301
tree2df7527691d212edee2428a08a8bf0413dae7bed
parent8643070afc0006b215d0be93ff098a3cfec01dde
parent85d2008960e9e538a4eda5a1c4e2197093c03966
Merge heisenberg.transvirtual.com:/tmp/linus-2.5
into heisenberg.transvirtual.com:/tmp/fbdev-2.5