]> 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, 23 Aug 2011 01:21:12 +0000 (11:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 01:21:12 +0000 (11:21 +1000)
commit7b13c4c4cd7de9a89fd6be0ef775d0f04bc3c18c
treeabf6263619e39ff66b7f7a662710ae67480fad96
parent3caaf0f4c2e1258afab5cfe651b9b076a4ac26da
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