tree 7071171a06de4e93fc890e0afce5c23596a26619
parent 80d9b24a658c83602aea66e45e2347c5bb3cbd47
parent 899e3ee404961a90b828ad527573aaaac39f0ab1
author Dave Airlie <airlied@redhat.com> 1318931670 +0100
committer Dave Airlie <airlied@redhat.com> 1318931670 +0100

Merge tag 'v3.1-rc10' into drm-core-next

There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/r600.c
	drivers/gpu/drm/radeon/radeon_asic.h