From: Dave Airlie <airlied@redhat.com>
Date: Wed, 8 Apr 2015 21:48:27 +0000 (+1000)
Subject: Merge tag 'v4.0-rc7' into drm-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~82^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d8ac08d498d579aae36221a80b4b724b2f52f39;p=pandora-kernel.git

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

Linux 4.0-rc7

Requested by Alex for fixes -next needs.

Conflicts:
	drivers/gpu/drm/i915/intel_sprite.c
---

1d8ac08d498d579aae36221a80b4b724b2f52f39