]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 25 May 2013 14:35:25 +0000 (10:35 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 25 May 2013 14:35:25 +0000 (10:35 -0400)
1  2 
sound/soc/fsl/imx-ssi.c

Simple merge