Merge remote-tracking branches 'asoc/topic/hisi', 'asoc/topic/img', 'asoc/topic/jack...
authorMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:41 +0000 (12:12 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:41 +0000 (12:12 +0100)
1  2  3  4  5 
sound/soc/soc-jack.c

Simple merge