Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:30 +0000 (13:45 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:30 +0000 (13:45 +0100)
1  2 
sound/soc/codecs/twl6040.c

Simple merge