]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 00:59:39 +0000 (10:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 00:59:39 +0000 (10:59 +1000)
commit1600fb29f8d6465d45fec83d338db5e4d79b097e
tree86809897e9d5af243021d1b4fcfaa8c7066aaa70
parentba5c24dc7c4caa9057b82a1e9f3ba522eb3b59f9
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