Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/ts3a277e' and ...

author Mark Brown <broonie@kernel.org>

Mon, 9 Feb 2015 07:10:32 +0000 (15:10 +0800)

committer Mark Brown <broonie@kernel.org>

Mon, 9 Feb 2015 07:10:32 +0000 (15:10 +0800)
author Mark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:32 +0000 (15:10 +0800)
committer Mark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:32 +0000 (15:10 +0800)
diff --cc sound/soc/codecs/ts3a227e.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 9 Feb 2015 07:10:32 +0000 (15:10 +0800)
committer	Mark Brown <broonie@kernel.org>
	Mon, 9 Feb 2015 07:10:32 +0000 (15:10 +0800)