Merge remote-tracking branch 'asoc/topic/dapm' into asoc-core
authorMark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:47 +0000 (15:40 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:47 +0000 (15:40 +0100)
commit38f7d75edcf8ced03d03131005ed806bee746699
tree1baf728abcc490365f499eef8c1b35b25435da5a
parentc22cff947a98ecd10c42974a39ced1819e5c868a
parent34742cb02bd368c1af3349c041d3e4446f7ac6ef
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-core
include/sound/soc.h