]> 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>
Fri, 21 Sep 2012 01:51:44 +0000 (11:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 01:51:44 +0000 (11:51 +1000)
commite470bdaafc6cec8726368f3637c2e38a6e07b0d6
tree6949daf9fd67f3fbb8ae33349c80ea9f0365ec8d
parent0989a4479a98b69bc29197a5d36aee3690aea971
parent2510051ae519a926d12a6d9a2283c65a4e665ba7
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