From: Dave Airlie <airlied@redhat.com>
Date: Wed, 16 Mar 2011 01:34:41 +0000 (+1000)
Subject: Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next
X-Git-Tag: v2.6.39-rc1~458^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38f1cff0863809587b5fd10ecd0c24c8b543a48c;p=pandora-kernel.git

Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.

Also fixes a trivial nouveau merge.

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_mem.c
---

38f1cff0863809587b5fd10ecd0c24c8b543a48c
Reading git-diff-tree failed