]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:55:43 +0000 (11:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:55:43 +0000 (11:55 +1000)
commit061767a00d669a65504204d597a38baa23a10c62
treea85c8f67f229aea3a818c2f6ffad21438ee2a7b7
parentff72460e3d0d55cb97e9663fd95c485fb3a3edbf
parent6058cc12d245cd86af9c8f65b80294cfcd02d03c
Merge remote-tracking branch 'sound-asoc/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-imx/mach-imx27_visstrim_m10.c