]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'devel/acpi-s3.v4.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 04:54:01 +0000 (23:54 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 04:54:01 +0000 (23:54 -0500)
commitaf87c1f1aac1f4faa384629f60ee3ac62c2ef9d7
treeb03ec663a9ffcbc06c846aa9ebc0ea656dc91260
parentced8b7943fe866a41b50263c279d0713fac6a386
parentee78caa16a0ce327e77f8ff14fba4d76bd5adf54
Merge branch 'devel/acpi-s3.v4.rebased' into uek2-merge

* devel/acpi-s3.v4.rebased:
  xen/pci:use hypercall PHYSDEVOP_restore_msi_ext to restore MSI/MSI-X vectors
  xen/acpi/sleep: Register to the acpi_suspend_lowlevel a callback.
  xen/acpi/sleep: Enable ACPI sleep via the __acpi_override_sleep
  xen/acpi: Domain0 acpi parser related platform hypercall
  xen: Utilize the restore_msi_irqs hook.
  x86/acpi/sleep: Provide registration for acpi_suspend_lowlevel.
  x86, acpi, tboot: Have a ACPI sleep override instead of calling tboot_sleep.
  x86: Expand the x86_msi_ops to have a restore MSIs.

Conflicts:
drivers/xen/Makefile
include/xen/interface/physdev.h
include/xen/interface/platform.h
arch/x86/kernel/acpi/boot.c
arch/x86/pci/xen.c
arch/x86/xen/enlighten.c
drivers/xen/Makefile
include/xen/interface/physdev.h