From: Dave Airlie <airlied@redhat.com>
Date: Mon, 18 Oct 2010 23:48:34 +0000 (+1000)
Subject: Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
X-Git-Tag: v2.6.37-rc1~92^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ae5056c94a8191c1fd0b5697707377516c0c5d;p=pandora-kernel.git

Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next

Conflicts:
	drivers/gpu/drm/i915/intel_fb.c
	drivers/gpu/drm/radeon/r600_blit_kms.c
	drivers/gpu/drm/ttm/ttm_bo.c
---

b7ae5056c94a8191c1fd0b5697707377516c0c5d
Reading git-diff-tree failed