On Tue, 24 Jan 2017, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> arch/arm/boot/dts/stm32f429.dtsi
>
> between commits:
>
> 3604ef9c8154 ("ARM: dts: stm32: Add ADC support to stm32f429")
> dd3feb755a4a ("ARM: dts: stm32: Add RTC su
Hi all,
Today's linux-next merge of the mfd tree got a conflict in:
arch/arm/boot/dts/stm32f429.dtsi
between commits:
3604ef9c8154 ("ARM: dts: stm32: Add ADC support to stm32f429")
dd3feb755a4a ("ARM: dts: stm32: Add RTC support for STM32F429 MCU")
from the arm-soc tree and commit:
90
On Thu, 15 Oct 2015, Stephen Rothwell wrote:
> Hi Lee,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> Documentation/devicetree/bindings/mfd/s2mps11.txt
>
> between commit:
>
> 6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
>
> from the arm-soc tr
2015-10-15 11:19 GMT+09:00 Stephen Rothwell :
> Hi Lee,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> Documentation/devicetree/bindings/mfd/s2mps11.txt
>
> between commit:
>
> 6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
>
> from the arm-soc tree an
Hi Lee,
Today's linux-next merge of the mfd tree got a conflict in:
Documentation/devicetree/bindings/mfd/s2mps11.txt
between commit:
6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
from the arm-soc tree and commit:
db96ec728d69 ("mfd: dt-bindings: Document pulled d
5 matches
Mail list logo