]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.6' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Aug 2012 13:33:40 +0000 (14:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Aug 2012 13:33:40 +0000 (14:33 +0100)
1  2 
sound/soc/fsl/imx-ssi.c

Simple merge