Merge branch 'renesas-kzm9g' into renesas-board-new

* renesas-kzm9g:
  ARM: mach-shmobile: kzm9g: enable SMP boot
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
  ARM: mach-shmobile: kzm9g: add SDHI support
  ARM: mach-shmobile: kzm9g: add MMCIF support
  ARM: mach-shmobile: kzm9g: correct screen direction
  ARM: mach-shmobile: sh73a0.h: add GPIO_NR
  ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3
  ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support
  ARM: mach-shmobile: kzm9g: add LCDC support
  ARM: mach-shmobile: kzm9g: add external USB Host support
  ARM: mach-shmobile: kzm9g: add SMSC 9221 support
  ARM: mach-shmobile: kzm9g: add defconfig
  ARM: mach-shmobile: add KZM-A9-GT board support

Conflicts:
	arch/arm/mach-shmobile/Makefile

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

diff --cc arch/arm/mach-shmobile/Makefile
index 6125c2b4d5232db24c4d59c552087dab265ab634,015c2d42e08f55cb1b344e23246c91d798ced11a..4ac8c12c72bad6ce7dee6e3eb7b17595810f9c6c
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -49,7 -49,7 +49,8 @@@ obj-$(CONFIG_MACH_MACKEREL)   += board-ma
  obj-$(CONFIG_MACH_KOTA2)      += board-kota2.o
  obj-$(CONFIG_MACH_BONITO)     += board-bonito.o
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen.o
 +obj-$(CONFIG_MACH_ARMADILLO800EVA)    += board-armadillo800eva.o
+ obj-$(CONFIG_MACH_KZM9G)      += board-kzm9g.o
  
  # Framework support
  obj-$(CONFIG_SMP)             += $(smp-y)