merge linus head to drm-mm branch
authorDave Airlie <airlied@starflyer.(none)>
Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
committerDave Airlie <airlied@linux.ie>
Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
commit23bfc1a339e98510f2ce25a2764a0cfe195faa9e
tree51652ad15f85d9d1367ae6f9b8641dfe46b4c501
parent312f5726055534be1dc9dd369be13aabd2943fcb
parent63172cb3d5ef762dcb60a292bc7f016b85cf6e1f
merge linus head to drm-mm branch
drivers/char/drm/mga_drv.h
drivers/char/drm/mga_state.c