Merge branches 'heads/boards-ape6evm', 'heads/boards-bockw', 'heads/boards-lager...

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
index 448468e5e73a14c6875614b509148099742769e4,7ed777d88e07810c4f0348308a7658262da17637,7ed777d88e07810c4f0348308a7658262da17637,7ed777d88e07810c4f0348308a7658262da17637,7ed777d88e07810c4f0348308a7658262da17637,ff04d1e2540a553b762eaff0d788b58f5c062b92..fca18176d385f1c690f692f706732020c24a0a13
--- 1/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 2/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 3/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 4/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 5/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 6/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@@@@@ -1192,12 -1144,13 -1144,13 -1144,13 -1144,13 -1147,9 +1195,8 @@@@@@@ static void __init eva_init(void
        r8a7740_pinmux_init();
        r8a7740_meram_workaround();
      
-----   /* SCIFA1 */
-----   gpio_request(GPIO_FN_SCIFA1_RXD, NULL);
-----   gpio_request(GPIO_FN_SCIFA1_TXD, NULL);
----- 
        /* LCDC0 */
        gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
 -----  gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */
      
        /* Touchscreen */
        gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
Simple merge