Merge remote-tracking branches 'asoc/topic/kcontrol', 'asoc/topic/max98357a' and...
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:44 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:44 +0000 (00:23 +0000)
1  2  3  4 
include/sound/soc.h
sound/soc/soc-ops.c

Simple merge
Simple merge