]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/for-linus-3.5' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 21:00:12 +0000 (17:00 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 21:00:12 +0000 (17:00 -0400)
commit4a3fda18c8ecdd56de23e4ecf789b1a26b8030b8
treec70bb7cec90b565489512cbad297186c65fc1f31
parent47deec46a27938b819de3b466e93b857418ab826
parent4b3451ad1313134821ad13b6fe821d0b4409aa18
Merge branch 'stable/for-linus-3.5' into linux-next

* stable/for-linus-3.5:
  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: update VA mapping when releasing memory during setup
  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: 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.

Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
arch/x86/xen/p2m.c
arch/x86/xen/smp.c
drivers/xen/grant-table.c