Merge remote-tracking branch 'asoc/topic/log' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)
1  2 
sound/soc/soc-core.c
sound/soc/soc-jack.c

Simple merge
Simple merge