Merge branch 'stable/for-linus-3.5' into linux-next

* stable/for-linus-3.5:
  xen/setup: Cap amount to populate based on current tot_pages count.
  xen: enter/exit lazy_mmu_mode around m2p_override calls
  xen/acpi/sleep: Enable ACPI sleep via the __acpi_os_prepare_sleep
  xen: implement IRQ_WORK_VECTOR handler
  xen: implement apic ipi interface
  xen/setup: Combine the two hypercall functions - since they are quite similar.
  xen/setup: Populate freed MFNs from non-RAM E820 entries and gaps to E820 RAM
  xen/setup: Work properly with 'dom0_mem=X' or with not dom0_mem.
  xen/setup: Only print "Freeing XXX-YYY pfn range: Z pages freed" if Z > 0
  xen/p2m: An early bootup variant of set_phys_to_machine
  xen/p2m: Collapse early_alloc_p2m_middle redundant checks.
  xen/p2m: Allow alloc_p2m_middle to call reserve_brk depending on argument
  xen/p2m: Move code around to allow for better re-usage.
  xen/gnttab: add deferred freeing logic

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc arch/x86/xen/p2m.c
Simple merge

diff --cc arch/x86/xen/smp.c
Simple merge

diff --cc drivers/xen/grant-table.c
Simple merge