RE: linux-next: manual merge of the arm-soc tree with the mfd tree

2013-06-20 Thread Gupta, Pekon
> Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm: > am33xx: > add TSC/ADC mfd device support") from the mfd tree and commit > 15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc tree. > > I

Re: linux-next: manual merge of the arm-soc tree with the mfd tree

2013-02-12 Thread Samuel Ortiz
Hi Roger, On Tue, Feb 12, 2013 at 04:46:51PM +0200, Roger Quadros wrote: > On 02/11/2013 08:52 PM, Tony Lindgren wrote: > > * Stephen Rothwell [130210 22:11]: > >> Hi all, > >> > >> Today's linux-next merge of the arm-soc tree got a conflict in > >> arch/arm/mach-omap2/usb-host.c between commit 8

Re: linux-next: manual merge of the arm-soc tree with the mfd tree

2013-02-12 Thread Roger Quadros
On 02/11/2013 08:52 PM, Tony Lindgren wrote: > * Stephen Rothwell [130210 22:11]: >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd: >> omap-usb-host: Consolidate OMAP USB-HS platform data") from the

Re: linux-next: manual merge of the arm-soc tree with the mfd tree

2013-02-11 Thread Olof Johansson
On Mon, Feb 11, 2013 at 10:52 AM, Tony Lindgren wrote: > * Stephen Rothwell [130210 22:11]: >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd: >> omap-usb-host: Consolidate OMAP USB-HS platform data"

Re: linux-next: manual merge of the arm-soc tree with the mfd tree

2013-02-11 Thread Tony Lindgren
* Stephen Rothwell [130210 22:11]: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd: > omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree > and commit c1d1cd597fc7 ("ARM: OMAP2+: o