From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Sep 2012 06:32:52 +0000 (+1000)
Subject: Merge remote-tracking branch 'msm/for-next'
X-Git-Tag: next-20120920~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a72c5ff151ab091c2bcd345280f456935949ee83;p=karo-tx-linux.git

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

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

a72c5ff151ab091c2bcd345280f456935949ee83