linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_pm.c between commit be3d26b0588c ("drm/i915:
get a PC8 reference when enabling the power well") from the
drm-intel-fixes tree and commit c1ca727f8945 ("drm/i915: support for
multiple power wells") from the drm-intel tree.

I fixed it up (the drm-intel-fixes tree patch also appears in the
drm-intel so I just use the drm-intel tree version of this file) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20131216/fc62f3f1/attachment.pgp>