Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

diff --cc drivers/base/regmap/internal.h
Simple merge

diff --cc drivers/base/regmap/regmap.c
Simple merge

diff --cc include/linux/regmap.h
Simple merge

diff --cc include/sound/rcar_snd.h
Simple merge

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