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

From: Stephen Rothwell
Date: Thu Aug 13 2015 - 02:00:49 EST

Hi all,

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


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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at