Merge tag 'renesas-defconfig-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 May 2015 15:36:53 +0000 (17:36 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 May 2015 15:36:53 +0000 (17:36 +0200)
commitef8d00abca1a6de4f2d896a9cdcee4ee5b04373b
treeabbcfc6c82d1e387747413c9a18640fcc6855c7d
parente355eb0a28c02da54b02b391d513142a0eee2447
parent90037558d5ed25a63499c3973cc1af25da02f673
Merge tag 'renesas-defconfig-for-v4.2' of git://git./linux/kernel/git/horms/renesas into next/defconfig

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

* Replace legacy-only USB_RCAR_GEN2_PHY with DT-only PHY_RCAR_GEN2

* tag 'renesas-defconfig-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2