Subject: linux-next: manual merge of the clk tree with the drm-msm tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 13 Aug 2015 16:00:43 +1000

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c

between commit:

  bdbc06e2309b ("drm/msm/dsi: Save/Restore PLL status across PHY reset")

from the drm-msm tree and commit:

  3dde2c2b968a ("drm/msm/dsi: Convert to clk_hw based provider APIs")

from the clk tree.

I fixed it up (the former removed some of the code updated by the latter)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/