Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:00 +0000 (15:10 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:00 +0000 (15:10 +0800)
commitafcfe4359e32f4fe1588b1d60414aacce676e27a
tree246377b48e8cbe7f87087b5fb1f1276cc17d5e61
parent0cee4db21e856d20aaa6624d0ff6a5f7d8aeea65
parent8f6f9b2982b2c924fe2dde816e2decb3ca1d8f8f
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