Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/board-armadillo800eva.c between commit
cbaf7f808081 ("ARM - shmobile: Armadillo800EVA: Move st1232 reset pin
handling") from the input tree and commits ead10fed8b4b ("ARM: shmobile:
armadillo: Replace
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/board-armadillo800eva.c between commit
cbaf7f808081 (ARM - shmobile: Armadillo800EVA: Move st1232 reset pin
handling) from the input tree and commits ead10fed8b4b (ARM: shmobile:
armadillo: Replace
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/tegra-kbc.c between commit 9eee07d39fa6 ("Input:
tegra-kbc - require CONFIG_OF, remove platform data") from the input tree
and commit 61fd290d213e ("ARM: tegra: migrate to new clock code") from
the
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/tegra-kbc.c between commit 9eee07d39fa6 (Input:
tegra-kbc - require CONFIG_OF, remove platform data) from the input tree
and commit 61fd290d213e (ARM: tegra: migrate to new clock code) from
the arm-soc
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/omap-keypad.c between commit 9e14f36bb577 ("Input:
omap-keypad - fixed formatting") from the input tree and commit
f799a3d8fe17 ("Input: omap-keypad: Remove dependencies to mach includes")
from the
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/omap-keypad.c between commit 9e14f36bb577 (Input:
omap-keypad - fixed formatting) from the input tree and commit
f799a3d8fe17 (Input: omap-keypad: Remove dependencies to mach includes)
from the arm-soc
6 matches
Mail list logo