Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_runtime_pm.c between commit
ac9b8236551d11 ("drm/i915: Introduce a gmbus power domain") from the
drm-intel-fixes tree and commit 73dfc227ff5c8e005 ("drm/i915/skl: init/uninit
display core as part of the
Sorry, I left you all off the cc list for this.
Begin forwarded message:
Date: Wed, 8 Jan 2014 12:50:55 +1100
From: Stephen Rothwell
To: Dave Airlie
Cc: linux-next at vger.kernel.org, linux-kernel at vger.kernel.org, Alexander
van Heukelum , Jani Nikula
Subject: linux-next: manual merge of
