Merge tag 'renesas-defconfig-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:22:25 +0000 (22:22 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:22:25 +0000 (22:22 +0100)
commitbdc5be0d00f1c6c1f43b65849e2152a9a39410c5
treee46bdbd99eb95f7dca194e1dc3d2e388b2df0a93
parentf114040e3ea6e07372334ade75d1ee0775c355e1
parentccde0fbd4fe88151c8d3a93a3e3a939a0a1753b2
Merge tag 'renesas-defconfig-for-v3.19' of git://git./linux/kernel/git/horms/renesas into next/defconfig

Pull "Renesas ARM Based SoC Defconfig Updates for v3.19" from Simon Horman:

* Enable AK4642, Audo DMAC peri peri and R-Car DMAC in shmobile defconrig
* Enable PM Runtime in ape6evm defconfig

* tag 'renesas-defconfig-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: multiplatform: add AK4642 support on defconfig
  ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig
  ARM: shmobile: multiplatform: add R-Car DMAC support on defconfig
  ARM: shmobile: ape6evm: Enable PM Runtime in defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>