]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:01:43 +0000 (14:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:01:43 +0000 (14:01 +1100)
1  2 
arch/arm/mach-omap2/mcbsp.c
arch/arm/mach-pxa/eseries.c
arch/arm/mach-pxa/stargate2.c
arch/arm/mach-pxa/tosa.c

Simple merge
Simple merge
Simple merge
Simple merge