From: Dave Airlie <airlied@redhat.com>
Date: Wed, 6 Oct 2010 01:10:48 +0000 (+1000)
Subject: Merge remote branch 'korg/drm-fixes' into drm-vmware-next
X-Git-Tag: v2.6.37-rc1~92^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb7ba2114bcd8bb51640c20bc68f89164b29b9ed;p=pandora-kernel.git

Merge remote branch 'korg/drm-fixes' into drm-vmware-next

necessary for some of the vmware fixes to be pushed in.

Conflicts:
	drivers/gpu/drm/drm_gem.c
	drivers/gpu/drm/i915/intel_fb.c
	include/drm/drmP.h
---

fb7ba2114bcd8bb51640c20bc68f89164b29b9ed
Reading git-diff-tree failed