Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:31 +0000 (14:28 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:31 +0000 (14:28 +0100)
commit8157567013e7368e1945b16aa039a1bfaf2bea5a
tree30207b20b5165fff096eee6478bd9f8710981333
parente7ac4fb607a365300ce7b68f68ded63fd1f3ecfa
parent2820f6158faec223cb426c8603fe589582e6903d
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
MAINTAINERS
include/sound/soc.h
sound/soc/codecs/Kconfig
sound/soc/soc-core.c
sound/soc/soc-dapm.c