Merge tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Feb 2014 00:01:11 +0000 (16:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Feb 2014 00:01:11 +0000 (16:01 -0800)
commit1cd731df09decfc7e9b4b86190efa262851f68e9
tree2ce721ab61a4234820a3d33c08f3d868a484ef65
parent251aa0fddd6149e730737c8619862a0160b00a5a
parentafca50132cfa7bfc5646676d8c67dc18454f38f8
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"
drivers/block/xen-blkback/blkback.c