linux-next: manual merge of the mfd tree with the arm-soc tree
lee.jones at linaro.org
Thu Oct 15 01:04:06 PDT 2015
On Thu, 15 Oct 2015, Stephen Rothwell wrote:
> Hi Lee,
> Today's linux-next merge of the mfd tree got a conflict in:
> between commit:
> 6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
> from the arm-soc tree and commit:
> db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")
> from the mfd tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Yeah, I thought this might happen.
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
More information about the linux-arm-kernel