From: Linus Torvalds Date: Sat, 13 Nov 2010 00:01:55 +0000 (-0800) Subject: Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=891cbd30ef456664e50bbd28436ef3006a81cf7c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- 891cbd30ef456664e50bbd28436ef3006a81cf7c