Merge remote-tracking branches 'asoc/topic/wm8804', 'asoc/topic/wm8904', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

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

committer Mark Brown <broonie@kernel.org>

Mon, 9 Feb 2015 07:10:34 +0000 (15:10 +0800)
author Mark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:34 +0000 (15:10 +0800)
committer Mark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:34 +0000 (15:10 +0800)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/codecs/wm8904.c
Simple merge
diff --cc sound/soc/codecs/wm8960.c
Simple merge
diff --cc sound/soc/codecs/wm8988.c
Simple merge
diff --cc sound/soc/codecs/wm8995.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 9 Feb 2015 07:10:34 +0000 (15:10 +0800)
committer	Mark Brown <broonie@kernel.org>
	Mon, 9 Feb 2015 07:10:34 +0000 (15:10 +0800)
		1	2	3	4	5	6
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/wm8904.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/wm8960.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/wm8988.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/wm8995.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history