From: Dave Airlie Date: Wed, 8 Apr 2015 21:48:27 +0000 (+1000) Subject: Merge tag 'v4.0-rc7' into drm-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d8ac08d498d579aae36221a80b4b724b2f52f39;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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