Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/core...

author Mark Brown <[email protected]>

Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)

committer Mark Brown <[email protected]>

Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)
author Mark Brown <[email protected]>
Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)
committer Mark Brown <[email protected]>
Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <[email protected]>
	Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)
committer	Mark Brown <[email protected]>
	Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)
		1	2	3	4	5
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history