From: Dave Airlie <airlied@redhat.com>
Date: Tue, 2 Dec 2014 00:58:33 +0000 (+1000)
Subject: Merge tag 'v3.18-rc7' into drm-next
X-Git-Tag: omap-for-v3.19/fixes-rc1~80^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8115e79aa62b6ebdb3e8e61ca4092cc32938afc;p=pandora-kernel.git

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
---

e8115e79aa62b6ebdb3e8e61ca4092cc32938afc
Reading git-diff-tree failed