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

2012-12-25 Thread Linus Walleij
On Fri, Dec 21, 2012 at 4:38 AM, Kukjin Kim wrote: > Stephen Rothwell wrote: >> >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got conflicts in >> drivers/pinctrl/pinctrl-exynos5440.c and >> drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl: >> exynos5440: Fix

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

2012-12-20 Thread Kukjin Kim
Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the arm-soc tree got conflicts in > drivers/pinctrl/pinctrl-exynos5440.c and > drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl: > exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c") from the >

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

2012-11-26 Thread Nicolas Ferre
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/26/2012 10:34 AM, Stephen Rothwell : > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/Makefile between commit ec6754a7b9e9 ("arm: at91: > dt: at91sam9 add serial pinctrl support") from the pinctrl

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

2012-11-13 Thread Nicolas Ferre
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/13/2012 05:17 AM, Stephen Rothwell : > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/tty/serial/atmel_serial.c between commit 784557decc48 > ("tty: atmel_serial: add pinctrl support") from the pinctrl tree

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

2012-11-09 Thread Linus Walleij
On Fri, Nov 9, 2012 at 3:31 AM, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/pinctrl/pinctrl-nomadik.c between commit 241e51ebd3b2 > ("pinctrl/nomadik: make independent of prcmu driver") from the pinctrl > tree and commit 44e47ccf8ab6 ("Merge