merge linus head to drm-mm branch

author Dave Airlie <airlied@starflyer.(none)>

Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)

committer Dave Airlie <airlied@linux.ie>

Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
author Dave Airlie <airlied@starflyer.(none)>
Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
committer Dave Airlie <airlied@linux.ie>
Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
diff --cc drivers/char/drm/mga_drv.h
Simple merge
diff --cc drivers/char/drm/mga_state.c
Simple merge
author	Dave Airlie <airlied@starflyer.(none)>
	Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
committer	Dave Airlie <airlied@linux.ie>
	Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
		1	2
drivers/char/drm/mga_drv.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/drm/mga_state.c	patch \|	diff1 \|	diff2 \|	blob \| history