Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:13 +0000 (13:35 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:13 +0000 (13:35 +0900)
commitcc43b45684018fc94ea9e007961bcf20ed8aaed8
tree306a7a96b108ce355c2f6eccee2166536d228595
parent05cf9dd84b91fab91ddf2398ae974516445295f0
parent330345ebdbe68e90a9592f3e1ac3bb63aed50cf8
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile