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

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7779.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge

diff --cc sound/soc/sh/fsi.c
index 9d7f307,bdaca35,5328ae5,5328ae5..4a10e4d
--- 1/sound/soc/sh/fsi.c
--- 2/sound/soc/sh/fsi.c
--- 3/sound/soc/sh/fsi.c
--- 4/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@@@ -20,8 -20,8 -20,7 -20,7 +20,9 @@@@@
    #include <linux/sh_dma.h>
    #include <linux/slab.h>
    #include <linux/module.h>
 +++#include <linux/workqueue.h>
    #include <sound/soc.h>
+ ++#include <sound/pcm_params.h>
    #include <sound/sh_fsi.h>
    
    /* PortA/PortB register */