Merge tag 'stable/for-linus-3.16-rc7-tag' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jul 2014 16:00:20 +0000 (09:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jul 2014 16:00:20 +0000 (09:00 -0700)
commitacba648dca67c6a224991a9e9f935b2bdec8dc17
tree2c9a08e4ae279850ac8e47010401be5095fdb957
parentd8772157ef7b5f4fe208f3e8da7b9c6800495698
parentb7dd0e350e0bd4c0fddcc9b8958342700b00b168
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