From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 10 Oct 2013 10:44:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
X-Git-Tag: v3.13-rc1~76^2~80^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=967ad7f1489da7babbe0746f81c283458ecd3f84;p=pandora-kernel.git

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.

i915_dma.c is just adjacent lines changed, nothing nefarious there.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/intel_drv.h

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

967ad7f1489da7babbe0746f81c283458ecd3f84
Reading git-diff-tree failed