Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:31 +0000 (19:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:31 +0000 (19:48 +0100)
commit77b62fa5d23988155132cf7fee44f2c209e3dc4c
tree41cafd1b209f115a3c97939e1a566c69d4c58a01
parentd1113af4e8c0f2cd71e52cb904447bd0eec8aa54
parent6b5b042d4c675cb9d3446a1cdcaca98e715ba812
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
include/sound/soc-dapm.h
include/sound/soc.h
sound/soc/soc-dapm.c