]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:07:17 +0000 (10:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:07:17 +0000 (10:07 +1000)
commite05f169fb2358d0d60e824a27e316714ab9b2026
tree6958ab7db7fadd5aea42ac80a74617a780ae17b3
parent79230857ab249ad14784c5d4bb5e31fd635bcd71
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/board-msm7x30.c
arch/arm/mach-msm/board-msm8960.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-msm/board-qsd8x50.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