Re: linux-next: manual merge of the pinctrl tree with the slave-dma tree

On 12 November 2012 08:45, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the pinctrl tree got a conflict in > arch/arm/boot/dts/spear1340.dtsi between commit b47394911c26 ("ARM: > SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and > commit > 4ddb1c29

linux-next: manual merge of the pinctrl tree with the slave-dma tree

Hi Linus, Today's linux-next merge of the pinctrl tree got a conflict in arch/arm/boot/dts/spear1340.dtsi between commit b47394911c26 ("ARM: SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and commit 4ddb1c295752 ("ARM: SPEAr: Add plgpio node in device tree dtsi files") fr