Merge tag 'renesas-defconfig2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 14:45:31 +0000 (16:45 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 14:45:31 +0000 (16:45 +0200)
commit3139c907dbc2f20b3d06033115b89ae3c5cdd722
tree41c829205f10f00d1b9d3a281582e1ffbdcaddd5
parenta5c0afd85dc8a352e50f66ee20ed7f95faf10d07
parentf2a5cefbbb2c69253a8a8aa7f7f77b22f0595811
Merge tag 'renesas-defconfig2-for-v4.2' of git://git./linux/kernel/git/horms/renesas into next/defconfig

Merge "Second Round of Renesas ARM Based SoC Defconfig Updates for v4.2" from Simon Horman:

* Enable shmobile r8a7778/bockw platform

* tag 'renesas-defconfig2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform
arch/arm/configs/multi_v7_defconfig