From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Oct 2011 09:54:30 +0000 (+0100)
Subject: Merge tag 'v3.1-rc10' into drm-core-next
X-Git-Tag: v3.2-rc1~135^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017ed8012e74ca15748863f45d2c078453026a0a;p=pandora-kernel.git

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
---

017ed8012e74ca15748863f45d2c078453026a0a
Reading git-diff-tree failed