Merge branches 'heads/soc-emev2', 'heads/soc-r8a73a4', 'heads/soc-r8a7779', 'heads...

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

diff --cc arch/arm/mach-shmobile/board-kzm9g-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-kzm9g.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-marzen.c
Simple merge

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

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

diff --cc include/linux/platform_data/gpio-rcar.h
index b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,cc472f6d8591dd00ed7ac4be6048948beeff3e96,cc472f6d8591dd00ed7ac4be6048948beeff3e96,cc472f6d8591dd00ed7ac4be6048948beeff3e96,cc472f6d8591dd00ed7ac4be6048948beeff3e96,cc472f6d8591dd00ed7ac4be6048948beeff3e96,b253f77a7ddf6ba4db532cdbeeae43cf7b1e16df,6c0027a3c370c6b38837395a6656af118774caad..2d8d6943281376a72195f5363cc1126560764e43
--- 1/include/linux/platform_data/gpio-rcar.h
--- 2/include/linux/platform_data/gpio-rcar.h
--- 3/include/linux/platform_data/gpio-rcar.h
--- 4/include/linux/platform_data/gpio-rcar.h
--- 5/include/linux/platform_data/gpio-rcar.h
--- 6/include/linux/platform_data/gpio-rcar.h
--- 7/include/linux/platform_data/gpio-rcar.h
--- 8/include/linux/platform_data/gpio-rcar.h
--- 9/include/linux/platform_data/gpio-rcar.h
--- 10/include/linux/platform_data/gpio-rcar.h
--- 11/include/linux/platform_data/gpio-rcar.h
--- 12/include/linux/platform_data/gpio-rcar.h
--- 13/include/linux/platform_data/gpio-rcar.h
--- 14/include/linux/platform_data/gpio-rcar.h
--- 15/include/linux/platform_data/gpio-rcar.h
--- 16/include/linux/platform_data/gpio-rcar.h
--- 17/include/linux/platform_data/gpio-rcar.h
--- 18/include/linux/platform_data/gpio-rcar.h
--- 19/include/linux/platform_data/gpio-rcar.h
+++ b/include/linux/platform_data/gpio-rcar.h
@@@@@@@@@@@@@@@@@@@@ -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,8 -21,8 -21,8 -21,8 -21,8 -21,6 -21,7 +21,9 @@@@@@@@@@@@@@@@@@@@ struct gpio_rcar_config 
                        unsigned int irq_base;
                        unsigned int number_of_pins;
                        const char *pctl_name;
++++++++++++++++++      unsigned has_both_edge_trigger:1;
                   };
                   
++++++++++++     ++#define RCAR_GP_PIN(bank, pin)               (((bank) * 32) + (pin))
++++++++++++     ++
                   #endif /* __GPIO_RCAR_H__ */