linux/kernel/power
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
..
console.c PM/gxfb: add hook to PM console layer that allows disabling of suspend VT switch 2008-04-28 08:58:36 -07:00
disk.c Suspend-related patches for 2.6.27 2008-06-12 14:25:09 -07:00
Kconfig PM: Remove legacy PM 2008-04-15 03:19:07 -04:00
main.c Suspend-related patches for 2.6.27 2008-06-12 14:25:09 -07:00
Makefile PM: Remove legacy PM 2008-04-15 03:19:07 -04:00
power.h Suspend: Add config option to disable the freezer if architecture wants that 2008-02-01 18:30:58 -05:00
poweroff.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
process.c Freezer: Introduce PF_FREEZER_NOSIG 2008-07-16 23:27:03 +02:00
snapshot.c Hibernation: Fix mark_nosave_pages() 2008-03-11 23:15:55 -04:00
swap.c Hibernation: Update messages 2008-02-01 18:30:55 -05:00
swsusp.c Hibernation: Update messages 2008-02-01 18:30:55 -05:00
user.c snapshot: Use pm_mutex for mutual exclusion 2008-07-16 23:27:03 +02:00