Merge tag 'renesas-soc-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 13:00:02 +0000 (15:00 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 13:00:02 +0000 (15:00 +0200)
Merge "Renesas ARM Based SoC Updates for v4.2" from Simon Horman:

* Only select sound drivers that build

* tag 'renesas-soc-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: only select sound drivers that build


Trivial merge