]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:56:39 +0000 (12:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:56:39 +0000 (12:56 +1100)
1  2 
arch/arm/mach-ux500/board-mop500-audio.c
sound/soc/fsl/fsl_ssi.c

Simple merge