Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:25 +0000 (15:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:25 +0000 (15:05 +0100)
commit5d5940d4690d5cd0321256902b2aea8d4c554416
treebd39a4ef6eaba9b80bcdf37c867b9e23c468480d
parent41ef2d5678d83af030125550329b6ae8b74618fa
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