From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Feb 2014 00:01:11 +0000 (-0800)
Subject: Merge tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v3.14-rc2~21
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=1cd731df09decfc7e9b4b86190efa262851f68e9;p=cascardo%2Flinux.git

Merge tag 'stable/for-linus-3.14-rc1-tag' of git://git./linux/kernel/git/xen/tip

Pull Xen fixes from Konrad Rzeszutek Wilk:
 "Bug-fixes:
   - Revert "xen/grant-table: Avoid m2p_override during mapping" as it
     broke Xen ARM build.
   - Fix CR4 not being set on AP processors in Xen PVH mode"

* tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pvh: set CR4 flags for APs
  Revert "xen/grant-table: Avoid m2p_override during mapping"
---

1cd731df09decfc7e9b4b86190efa262851f68e9