Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:04 +0000 (20:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:04 +0000 (20:57 +0000)
commitb47f8a5dfb4fcc906d93c42a22f050d69df96ea6
tree4cca1bae26ab7fc6df207c14909f6d98f4e5dd0e
parentd01aa9b704afa8875c2ae919cfd639660b2a26bc
parentfcf6c5ea7abd42cfc2dde0ff0451b209951de9b4
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
include/sound/soc-dapm.h
sound/soc/soc-core.c
sound/soc/soc-dapm.c