Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 23 Apr 2013 18:25:18 +0000 (19:25 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 23 Apr 2013 18:25:18 +0000 (19:25 +0100)
commit83097a9c677101645665ac7222e06ebd03a9e997
tree7e4eb8a7a19607c28ff75a35fb2bdec42121bb55
parent60d509fa6a9c4653a86ad830e4c4b30360b23f0e
parent60b6f1a1e578a5f8a245d4b7622ebf2bad7798cb
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
include/sound/soc-dapm.h
sound/soc/soc-core.c
sound/soc/soc-dapm.c