Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:15 +0000 (00:22 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:15 +0000 (00:22 +0900)
commit473e8b323c97d1e63ca307b40468addbabfe511a
tree180b3441a9cf733ef9e20b0bab976eca90fefa78
parent29998eb6180d7c7a45c48d629603b4ca2a7d19ec
parent83f7cbc43b623d8498b2b542f0dfb9d9f67db2fd
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile