]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 01:09:00 +0000 (11:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 01:09:00 +0000 (11:09 +1000)
commite968f032f4420d45d8780b2e75e873ab9184976d
tree5485b29f2c9d384b300733737d27a2eaebc470aa
parentb3bc857dc9244f08eab3f1781be60f0bdd037007
parentf2ba30560a71b39b4ad3230f5deb96fefaaa6417
Merge remote-tracking branch 'msm/for-next'

Conflicts:
arch/arm/mach-msm/io.c
arch/arm/mach-msm/Makefile
arch/arm/mach-msm/acpuclock-arm11.c
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
arch/arm/mach-msm/io.c