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

author Mark Brown <[email protected]>

Thu, 6 Apr 2017 10:50:04 +0000 (11:50 +0100)

committer Mark Brown <[email protected]>

Thu, 6 Apr 2017 10:50:04 +0000 (11:50 +0100)
author Mark Brown <[email protected]>
Thu, 6 Apr 2017 10:50:04 +0000 (11:50 +0100)
committer Mark Brown <[email protected]>
Thu, 6 Apr 2017 10:50:04 +0000 (11:50 +0100)
diff --cc sound/soc/sh/rcar/adg.c
Simple merge
diff --cc sound/soc/sh/rcar/core.c
Simple merge
author	Mark Brown <[email protected]>
	Thu, 6 Apr 2017 10:50:04 +0000 (11:50 +0100)
committer	Mark Brown <[email protected]>
	Thu, 6 Apr 2017 10:50:04 +0000 (11:50 +0100)
		1	2
sound/soc/sh/rcar/adg.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/sh/rcar/core.c	patch \|	diff1 \|	diff2 \|	blob \| history