Merge remote-tracking branches 'asoc/topic/atmel-classd', 'asoc/topic/const' and...
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:37 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:37 +0000 (00:23 +0000)
1  2  3  4 
sound/soc/atmel/atmel-classd.c
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge
Simple merge