Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:02 +0000 (14:19 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:02 +0000 (14:19 +0000)
commitc9aa1625b747913151db5f51a543cbcc24ca03aa
tree02ad2843546a53b8c3d303ab8a70c4722abc15fb
parentdadaa4717b1026fa358c036b939e5548e08d6b53
parente95d73c437a09e7febea18f8e998f958ef6d7a72
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
sound/soc/omap/ams-delta.c