Merge branch 'renesas-kzm9g' into renesas-board-new
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 12 May 2012 20:36:02 +0000 (22:36 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sat, 12 May 2012 20:36:02 +0000 (22:36 +0200)
commita515be1ca7df947db0f6018a174f49507affcdbc
tree8f5be875e2902bee701a6840ba1fbb19e8d0384a
parent9183857d503f915ee05abb6e03cea7253dcbace6
parentfecf84c14fa755b0e30ba64a290db658a06c76fb
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
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile