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

author Mark Brown <broonie@kernel.org>

Thu, 10 Aug 2017 14:51:05 +0000 (15:51 +0100)

committer Mark Brown <broonie@kernel.org>

Thu, 10 Aug 2017 14:51:05 +0000 (15:51 +0100)
author Mark Brown <broonie@kernel.org>
Thu, 10 Aug 2017 14:51:05 +0000 (15:51 +0100)
committer Mark Brown <broonie@kernel.org>
Thu, 10 Aug 2017 14:51:05 +0000 (15:51 +0100)
diff --cc sound/soc/sh/rcar/core.c
Simple merge
diff --cc sound/soc/sh/rcar/ssi.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Thu, 10 Aug 2017 14:51:05 +0000 (15:51 +0100)
committer	Mark Brown <broonie@kernel.org>
	Thu, 10 Aug 2017 14:51:05 +0000 (15:51 +0100)
		1	2
sound/soc/sh/rcar/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/sh/rcar/ssi.c	patch \|	diff1 \|	diff2 \|	blob \| history