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

2012-10-12 Thread Linus Walleij
On Fri, Oct 12, 2012 at 5:04 AM, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the pinctrl tree got a conflict in > arch/arm/mach-at91/at91sam9n12.c between commit f7d19b906556 ("ARM: at91: > add clocks for I2C DT entries") from the tree and commit 5c70cd3c7c69 > ("arm: at9

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

2012-10-11 Thread Stephen Rothwell
Hi Linus, Today's linux-next merge of the pinctrl tree got a conflict in arch/arm/mach-at91/at91sam9n12.c between commit f7d19b906556 ("ARM: at91: add clocks for I2C DT entries") from the tree and commit 5c70cd3c7c69 ("arm: at91: dt: at91sam9 add pinctrl support") from the pinctrl tree. I fixed