Merge heisenberg.transvirtual.com:/tmp/linus-2.5
authorJames Simmons <jsimmons@heisenberg.transvirtual.com>
Mon, 3 Jun 2002 02:34:13 +0000 (19:34 -0700)
committerJames Simmons <jsimmons@heisenberg.transvirtual.com>
Mon, 3 Jun 2002 02:34:13 +0000 (19:34 -0700)
commit96520e1d029f959374879778c68a63de1968d3e6
treeec4218e78adc716ddea955903c9dade5cb605074
parenta990709108dd9f27b7fd2b4a57bd56c4893e691c
parentc88b20f7a6372563f9aff70b7d2b8587a82f30fb
Merge heisenberg.transvirtual.com:/tmp/linus-2.5
into heisenberg.transvirtual.com:/tmp/fbdev-2.5