author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 20 Jun 2011 16:01:33 +0000 (09:01 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 20 Jun 2011 16:01:33 +0000 (09:01 -0700) |
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/setup: Fix for incorrect xen_extra_mem_start.
xen: When calling power_off, don't call the halt function.
xen: Fix compile warning when CONFIG_SMP is not defined.
xen: support CONFIG_MAXSMP
xen: partially revert "xen: set max_pfn_mapped to the last pfn mapped"
xen/setup: Fix for incorrect xen_extra_mem_start.
xen: When calling power_off, don't call the halt function.
xen: Fix compile warning when CONFIG_SMP is not defined.
xen: support CONFIG_MAXSMP
xen: partially revert "xen: set max_pfn_mapped to the last pfn mapped"
Trivial merge