Merge remote-tracking branch 'asoc/topic/jack' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:32 +0000 (14:19 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:32 +0000 (14:19 +0000)
1  2 
include/sound/soc.h

Simple merge