]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/processor-passthru.v5.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 04:49:59 +0000 (23:49 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 04:49:59 +0000 (23:49 -0500)
commitced8b7943fe866a41b50263c279d0713fac6a386
tree214e0c8c57422e0967f8c7235b045cb6f08cf2fc
parentcd5ea6b4cd9891e99c54fbcfe1f491ad4e575d43
parent4d2a2489aaa76935c2ade8343b96d9ee218bf88e
Merge branch 'stable/processor-passthru.v5.rebased' into uek2-merge

* stable/processor-passthru.v5.rebased:
  xen/processor-passthru: Provide an driver that passes struct acpi_processor data to the hypervisor.
  xen/enlighten: Expose MWAIT and MWAIT_LEAF if hypervisor OKs it.
  xen/setup/pm/acpi: Remove the call to boot_option_idle_override.
  xen/acpi: Domain0 acpi parser related platform hypercall
  xen/pm_idle: Make pm_idle be default_idle under Xen.
  cpuidle: stop depending on pm_idle
  cpuidle: replace xen access to x86 pm_idle and default_idle
  cpuidle: create bootparam "cpuidle.off=1"

Conflicts:
drivers/xen/Kconfig
drivers/xen/Makefile
include/xen/interface/platform.h
arch/arm/kernel/process.c
arch/x86/xen/enlighten.c
arch/x86/xen/setup.c
drivers/xen/Kconfig
drivers/xen/Makefile