Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
drivers/pinctrl/pinctrl-samsung.c and drivers/pinctrl/pinctrl-samsung.h
between commit 61dd72613177 ("pinctrl: Add pinctrl-s3c64xx driver") from
the pinctrl tree and commit f67faf487fc1 ("pinctrl: exynos: add
exynos5250 SoC
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
drivers/pinctrl/pinctrl-samsung.c and drivers/pinctrl/pinctrl-samsung.h
between commit 61dd72613177 (pinctrl: Add pinctrl-s3c64xx driver) from
the pinctrl tree and commit f67faf487fc1 (pinctrl: exynos: add
exynos5250 SoC
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit e32af8894588
("pinctrl/nomadik: add device tree support") from the pinctrl tree and
commit 6010d40320f8 ("ARM: nomadik: move GPIO and pinctrl to device
tree") from the arm-soc
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit e32af8894588
(pinctrl/nomadik: add device tree support) from the pinctrl tree and
commit 6010d40320f8 (ARM: nomadik: move GPIO and pinctrl to device
tree) from the arm-soc tree.
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
On Fri, Dec 21, 2012 at 4:38 AM, Kukjin Kim kgene@samsung.com 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:
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
>
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
pinctrl tree and commit d5fd5da290ce
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
pinctrl tree and commit d5fd5da290ce
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
pinctrl
-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
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 tree and commit
e8d623986990 ("Merge branch 'next/soc' into for-next") from the arm-soc
tree.
I
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 tree and commit
e8d623986990 (Merge branch 'next/soc' into for-next) from the arm-soc
tree.
I fixed
-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 tree
-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
-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
and
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 and commit
bcd2360c1ff9 ("arm: at91: move platfarm_data to
include/linux/platform_data/atmel.h")
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 and commit
bcd2360c1ff9 (arm: at91: move platfarm_data to
include/linux/platform_data/atmel.h) from
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
On Fri, Nov 9, 2012 at 3:31 AM, Stephen Rothwell s...@canb.auug.org.au 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
Hi all,
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 branch 'next/multiplatform' into
for-next") from the
Hi all,
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 branch 'next/multiplatform' into
for-next) from the arm-soc
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-ux500/cpu-db8500.c between commit 63c53906312f
("pinctrl/nomadik: move the platform data header") from the pinctrl tree
and commit 4040d10a3d44 ("ARM: ux500: add DB serial number to entropy
pool") from the
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-ux500/cpu-db8500.c between commit 63c53906312f
(pinctrl/nomadik: move the platform data header) from the pinctrl tree
and commit 4040d10a3d44 (ARM: ux500: add DB serial number to entropy
pool) from the arm-soc
24 matches
Mail list logo
