Merge tag 'renesas-defconfig-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 20:41:42 +0000 (13:41 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 20:41:42 +0000 (13:41 -0700)
Merge "Renesas ARM Based SoC Defconfig Updates for v3.16" from Simon Horman:

SH Mobile Multi-Platform
* Enable USB [EO]HCI HCD, VSP1, HIGHMEM, USBHS, I2C_SH_MOBILE,
  EEPROM_AT24 and MSIOF

* tag 'renesas-defconfig-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable USB [EO]HCI HCD support in shmobile_defconfig
  ARM: shmobile: Enable VSP1 in shmobile_defconfig
  ARM: shmobile: Enable HIGHMEM in shmobile_defconfig
  ARM: shmobile: Enable USBHS gadget support in shmobile_defconfig
  ARM: shmobile: Include at24.c in shmobile_defconfig
  ARM: shmobile: Include i2c-shmobile.c in shmobile_defconfig
  ARM: shmobile: multiplatform: Enable MSIOF in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge