linux-next: manual merge of the regulator tree with the qcom tree

[Stephen Rothwell]

Hi all,

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

  Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt

between commit:

  f6251e80956d ("soc: qcom: documentation: Update SMD/RPM Docs")
  9ee8373a1552 ("soc: qcom: smd-rpm: Add existing platform support")

from the qcom tree and commit:

  7a400585893e ("soc: qcom: documentation: Update SMD/RPM Docs")

from the regulator tree.

I fixed it up (I used the qcom tree version - please sort out the
mess).

-- 
Cheers,
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  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/