From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Jul 2013 18:34:56 +0000 (-0700)
Subject: Merge tag 'xen-arm-3.11-rc2-warn-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.11-rc4~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=878d2cd6738f65907da0136325e4060b2d2ece14;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'xen-arm-3.11-rc2-warn-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen

Pull Xen ARM fix from Stefano Stabellini.

Update xen_restart to new calling convention.

* tag 'xen-arm-3.11-rc2-warn-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen:
  xen/arm,arm64: update xen_restart after ff701306cd49 and 7b6d864b48d9
---

878d2cd6738f65907da0136325e4060b2d2ece14