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

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

Conflicts:
	arch/arm/mach-vt8500/include/mach/restart.h
---

d9ab15e01361c6647e0dd2a7d98f25275411a600