Merge branch 'stable/bug-fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 00:40:25 +0000 (17:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 00:40:25 +0000 (17:40 -0700)
commit8653b3f1d5bf2c7b09962a5747c74280758444ee
treebef0cf99c341f8d9212d069c18f9f7961f34bac9
parentd09571059b89cf1a079afe88ecb64386f591b061
parentee176455e28469e2420032aab3db11ac2ae3eaa8
Merge branch 'stable/bug-fixes-rc4' of git://git./linux/kernel/git/konrad/xen

* 'stable/bug-fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: mask_rw_pte: do not apply the early_ioremap checks on x86_32
  xen: do not create the extra e820 region at an addr lower than 4G