From: Dave Airlie <airlied@redhat.com>
Date: Mon, 7 Dec 2009 21:03:55 +0000 (+1000)
Subject: Merge remote branch 'origin/drm-core-next' into test
X-Git-Tag: v2.6.33-rc1~323^2~3^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84676185368e36c6bc0eeab87ab73ed39042648;p=pandora-kernel.git

Merge remote branch 'origin/drm-core-next' into test

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

f84676185368e36c6bc0eeab87ab73ed39042648
Reading git-diff-tree failed