lkml.org 
[lkml]   [2015]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the regulator tree with the qcom tree
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@canb.auug.org.au


\
 
 \ /
  Last update: 2015-12-17 03:21    [W:0.048 / U:0.932 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site