From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 30 Mar 2015 14:37:08 +0000 (+0200)
Subject: Merge tag 'v4.0-rc6' into drm-intel-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~82^2~20^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e0aa8018f9c676b115b7ca6c20a056fc57c68a9;p=pandora-kernel.git

Merge tag 'v4.0-rc6' into drm-intel-next

Backmerge Linux 4.0-rc6 because conflicts are (again) getting out of
hand. To make sure we don't lose any bugfixes from the 4.0-rc5-rc6
flurry of patches we've applied them all to -next too.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

Always take the version from -next, we've already handled all
conflicts with explicit cherrypicking.

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

6e0aa8018f9c676b115b7ca6c20a056fc57c68a9
Reading git-diff-tree failed