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)
commitfd2e1dd7bb2e4f19e063aff9194b795be8510464
treef3f94c341531014a3e2cd175984c553671458ea1
parent77b67063bb6bce6d475e910d3b886a606d0d91f7
parentab6f6d85210c4d0265cf48e9958c04e08595055a
parent631a7b5d958d2ef2c2333b105794c693642f0641
parent86bc52ef4373be64867b56f3a9e30cbabf64e0dd
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2

These are all dependencies for the renesas/boards2 branch.

Conflicts:
arch/arm/configs/marzen_defconfig
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/clock-r8a7779.c
arch/arm/mach-shmobile/setup-r8a7779.c
sound/soc/sh/fsi.c