]> 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 23:35:08 +0000 (09:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 23:35:08 +0000 (09:35 +1000)
commit6c2abef3c3cbf2aab3cf894e420dfa57ee96277f
tree54ef8d249dfbca214f430357994a8596b8eeb4db
parentbb36d453dae2b9efd7d8ccc37b37a04e9c8ecb1a
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