Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 20:57:52 +0000 (21:57 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 20:57:52 +0000 (21:57 +0100)
These are all dependencies for the renesas/boards2 branch.

Conflicts:
arch/arm/configs/marzen_defconfig


Trivial merge