]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitda5887c239bd55817387655eb2cf993861888d06
tree081fa8ec6c2168acc7ee428857b545540055df76
parent93f1bf3486a4cc830014f4e9d055dc15a323bec4
parent6bc484998242dc3fdb2f19601c9528c2ef99583c
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