Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

author Mark Brown <broonie@kernel.org>

Wed, 8 Apr 2015 20:09:54 +0000 (21:09 +0100)

committer Mark Brown <broonie@kernel.org>

Wed, 8 Apr 2015 20:09:54 +0000 (21:09 +0100)
author Mark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:09:54 +0000 (21:09 +0100)
committer Mark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:09:54 +0000 (21:09 +0100)
diff --cc sound/soc/tegra/tegra_max98090.c
Simple merge
diff --cc sound/soc/tegra/tegra_rt5677.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 8 Apr 2015 20:09:54 +0000 (21:09 +0100)
committer	Mark Brown <broonie@kernel.org>
	Wed, 8 Apr 2015 20:09:54 +0000 (21:09 +0100)
		1	2
sound/soc/tegra/tegra_max98090.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/tegra/tegra_rt5677.c	patch \|	diff1 \|	diff2 \|	blob \| history