Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
commit64fdf13c8b5ff530f54dd767861f4e25a9ec2fe9
tree43d63a2217cb6d6d8a5105f341ccf6804b29fabf
parent97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9
parent5dc0158a27f65e7efaa6e3cc496d93b4c4c65d19
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
include/sound/soc-dapm.h
sound/soc/soc-dapm.c