Merge remote branch 'origin/master' into radeon-rewrite

author Dave Airlie <airlied@redhat.com>

Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)

committer Dave Airlie <airlied@redhat.com>

Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)
author Dave Airlie <airlied@redhat.com>
Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)
committer Dave Airlie <airlied@redhat.com>
Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)
diff --cc configs/autoconf.in
Simple merge
diff --cc configure.ac
Simple merge
author	Dave Airlie <airlied@redhat.com>
	Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)
		1	2
configs/autoconf.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history