Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:59:18 +0000 (15:59 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:59:18 +0000 (15:59 +0100)
1  2  3  4 
sound/soc/codecs/wm8996.c
sound/soc/zte/zx296702-i2s.c

Simple merge
Simple merge