From: Dave Airlie <airlied@redhat.com>
Date: Tue, 8 Dec 2009 03:52:41 +0000 (+1000)
Subject: Merge branch 'drm-core-next' into drm-linus
X-Git-Tag: v2.6.33-rc1~323^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bd049fa895f9c6743f38b52ce14775f5a31ea63;p=pandora-kernel.git

Merge branch 'drm-core-next' into drm-linus

Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.

Conflicts:
	drivers/gpu/drm/drm_fb_helper.c
---

1bd049fa895f9c6743f38b52ce14775f5a31ea63
Reading git-diff-tree failed