Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:29 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:29 +0000 (17:20 +0100)
commitbfe617d33db9871b1ac25b62e9086336cd633db2
tree1f7e192567d929d0197bbc9792fd0fee588f7d3c
parent5f5eb4efe575734e54f26c34ffffc4b48cdca3aa
parent1aad4e574bced05b4036e79981a7800dd275cf1c
Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile