Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:19 +0000 (00:22 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:19 +0000 (00:22 +0900)
commit2ca5e86c4caae2509f2eba0fcd86be05e224019d
tree40706a064ebc04e92ffd7e53eb4443b186846b41
parentceb8ef5e6dd55ddcfd875262f83c824f01f02181
parent330345ebdbe68e90a9592f3e1ac3bb63aed50cf8
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile