Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Nov 2010 00:01:55 +0000 (16:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Nov 2010 00:01:55 +0000 (16:01 -0800)
commit891cbd30ef456664e50bbd28436ef3006a81cf7c
tree081fa8ec6c2168acc7ee428857b545540055df76
parentb5c551043617ecf84ad6bb888f96fdf4e4769d4c
parent9ec23a7f6d2537faf14368e066e307c06812c4ca
Merge branch 'upstream/core' of git://git./linux/kernel/git/jeremy/xen

* 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen: do not release any memory under 1M in domain 0
  xen: events: do not unmask event channels on resume
  xen: correct size of level2_kernel_pgt