From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Jun 2014 17:53:27 +0000 (-1000)
Subject: Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~10134
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3d09c623947a855ab9a21267c31f926cafa2c5bb;p=mirror_ubuntu-artful-kernel.git

Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen fixes from David Vrabel:
 "Xen regression and PVH fixes for 3.16-rc1

   - fix dom0 PVH memory setup on latest unstable Xen releases
   - fix 64-bit x86 PV guest boot failure on Xen 3.1 and earlier
   - fix resume regression on non-PV (auto-translated physmap) guests"

* tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/grant-table: fix suspend for non-PV guests
  x86/xen: no need to explicitly register an NMI callback
  Revert "xen/pvh: Update E820 to work with PVH (v2)"
  x86/xen: fix memory setup for PVH dom0
---

3d09c623947a855ab9a21267c31f926cafa2c5bb