tree 081fa8ec6c2168acc7ee428857b545540055df76
parent b5c551043617ecf84ad6bb888f96fdf4e4769d4c
parent 9ec23a7f6d2537faf14368e066e307c06812c4ca
author Linus Torvalds <torvalds@linux-foundation.org> 1289606515 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289606515 -0800

Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/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