Merge branch 'fix/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/sh/rcar/adg.c
Simple merge

diff --cc sound/soc/sh/rcar/cmd.c
Simple merge

diff --cc sound/soc/sh/rcar/core.c
Simple merge

diff --cc sound/soc/sh/rcar/gen.c
Simple merge

diff --cc sound/soc/sh/rcar/rsnd.h
Simple merge

diff --cc sound/soc/sh/rcar/src.c
Simple merge

diff --cc sound/soc/sh/rcar/ssi.c
Simple merge

diff --cc sound/soc/sh/rcar/ssiu.c
Simple merge