Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8988' and 'asoc...

author Mark Brown <broonie@kernel.org>

Wed, 4 Feb 2015 20:57:26 +0000 (20:57 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 4 Feb 2015 20:57:26 +0000 (20:57 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:26 +0000 (20:57 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:26 +0000 (20:57 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/codecs/wm8960.c
Simple merge
diff --cc sound/soc/codecs/wm8988.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 4 Feb 2015 20:57:26 +0000 (20:57 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 4 Feb 2015 20:57:26 +0000 (20:57 +0000)
		1	2	3	4
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sound/soc/codecs/wm8960.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sound/soc/codecs/wm8988.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history