From: Dave Airlie <airlied@redhat.com>
Date: Mon, 9 Mar 2015 09:58:30 +0000 (+1000)
Subject: Merge tag 'v4.0-rc3' into drm-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~82^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8c6ecb3be7029881f7c95e5e201a629094a4e1a;p=pandora-kernel.git

Merge tag 'v4.0-rc3' into drm-next

Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/intel_display.c
---

a8c6ecb3be7029881f7c95e5e201a629094a4e1a
Reading git-diff-tree failed