From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Jul 2014 16:00:20 +0000 (-0700)
Subject: Merge tag 'stable/for-linus-3.16-rc7-tag' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v3.16~15
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=acba648dca67c6a224991a9e9f935b2bdec8dc17;p=jlayton%2Flinux.git

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

Pull Xen fix from David Vrabel:
 "Fix BUG when trying to expand the grant table.  This seems to occur
  often during boot with Ubuntu 14.04 PV guests"

* tag 'stable/for-linus-3.16-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: safely map and unmap grant frames when in atomic context
---

acba648dca67c6a224991a9e9f935b2bdec8dc17