tree e0e540f992aae6dfd3bfa1f8de42461ac1656c1a
parent c01ad4081939f91ebd7277e8e731fd90ceb3e632
parent acd049c6e99d2ad1195666195230f6881d1c1588
author Linus Torvalds <torvalds@linux-foundation.org> 1308585693 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308585693 -0700

Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* '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"