]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge