From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 11 Sep 2014 12:46:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework
X-Git-Tag: omap-for-v3.19/prcm-cleanup~70^2~39^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=336879b1da97fffc097f77c6d6f818660f2826f0;p=pandora-kernel.git

Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework

Dave asked me to do the backmerge before sending him the revised pull
request, so here we go. Nothing fancy in the conflicts, just a few
things changed right next to each another.

Conflicts:
	drivers/gpu/drm/drm_irq.c

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

336879b1da97fffc097f77c6d6f818660f2826f0
Reading git-diff-tree failed