linux/arch/x86/kernel/acpi
Linus Torvalds dc7c65db28 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits)
  Revert "x86/PCI: ACPI based PCI gap calculation"
  PCI: remove unnecessary volatile in PCIe hotplug struct controller
  x86/PCI: ACPI based PCI gap calculation
  PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
  PCI PM: Fix pci_prepare_to_sleep
  x86/PCI: Fix PCI config space for domains > 0
  Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n
  PCI: Simplify PCI device PM code
  PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep
  PCI ACPI: Rework PCI handling of wake-up
  ACPI: Introduce new device wakeup flag 'prepared'
  ACPI: Introduce acpi_device_sleep_wake function
  PCI: rework pci_set_power_state function to call platform first
  PCI: Introduce platform_pci_power_manageable function
  ACPI: Introduce acpi_bus_power_manageable function
  PCI: make pci_name use dev_name
  PCI: handle pci_name() being const
  PCI: add stub for pci_set_consistent_dma_mask()
  PCI: remove unused arch pcibios_update_resource() functions
  PCI: fix pci_setup_device()'s sprinting into a const buffer
  ...

Fixed up conflicts in various files (arch/x86/kernel/setup_64.c,
arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c,
drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86
and ACPI updates manually.
2008-07-16 17:25:46 -07:00
..
realmode x86 ACPI: normalize segment descriptor register on resume 2008-07-05 08:25:40 +02:00
boot.c x86: I/O APIC: remove an IRQ2-mask hack 2008-07-13 11:43:48 +02:00
cstate.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel 2008-04-21 15:40:24 -07:00
Makefile kbuild, suspend, x86: fix rebuild of wakeup.bin 2008-05-04 20:04:45 +02:00
processor.c ACPI: Disable the C2C3_FFH access mode HW has no MWAIT support 2008-07-16 23:27:04 +02:00
sleep.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2008-07-16 17:25:46 -07:00
sleep.h x86: move suspend wakeup code to C 2008-04-17 17:41:37 +02:00
wakeup_32.S x86: move suspend wakeup code to C 2008-04-17 17:41:37 +02:00
wakeup_64.S x86: move suspend wakeup code to C 2008-04-17 17:41:37 +02:00
wakeup_rm.S x86: move suspend wakeup code to C 2008-04-17 17:41:37 +02:00