From: Eric Anholt <eric@anholt.net>
Date: Fri, 7 May 2010 21:30:03 +0000 (-0700)
Subject: Merge remote branch 'origin/master' into drm-intel-next
X-Git-Tag: v2.6.35-rc1~451^2~12^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34dc4d4423dc342848d72be764832cbc0852854a;p=pandora-kernel.git

Merge remote branch 'origin/master' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
---

34dc4d4423dc342848d72be764832cbc0852854a
Reading git-diff-tree failed