From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 05:12:50 +0000 (+1000)
Subject: Merge remote-tracking branch 'msm/for-next'
X-Git-Tag: next-20120926~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=17204c97af8dfa56b5b9391318477474e34ccf3b;p=karo-tx-linux.git

Merge remote-tracking branch 'msm/for-next'

Conflicts:
	arch/arm/mach-msm/board-dt-8660.c
	arch/arm/mach-msm/board-dt-8960.c
	arch/arm/mach-msm/common.h
	arch/arm/mach-vt8500/include/mach/restart.h
---

17204c97af8dfa56b5b9391318477474e34ccf3b