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

Simple merge
Simple merge