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
..
2008-05-23 20:33:28 +02:00
2008-04-17 17:41:33 +02:00
2008-07-09 09:14:12 +02:00
2008-04-19 19:19:54 +02:00
2008-07-08 13:10:58 +02:00
2008-05-25 08:58:35 +02:00
2008-07-09 09:13:59 +02:00
2008-07-14 11:37:46 +02:00
2008-05-01 08:03:58 -07:00
2008-07-10 10:43:26 +02:00
2008-07-08 10:38:19 +02:00
2008-07-09 07:43:25 +02:00
2008-04-18 00:46:35 +02:00
2008-07-08 13:10:28 +02:00
2008-06-02 12:29:31 +02:00
2008-07-10 10:43:26 +02:00
2008-05-25 10:55:10 +02:00
2008-05-12 21:28:05 +02:00
2008-05-24 11:22:12 +02:00
2008-04-17 20:05:37 +02:00
2008-04-27 12:01:19 +03:00
2008-07-08 13:10:31 +02:00
2008-07-08 13:10:31 +02:00
2008-07-08 13:10:31 +02:00
2008-07-08 12:24:13 +02:00
2008-06-10 15:52:07 +02:00
2008-07-08 13:10:24 +02:00
2008-04-17 17:40:58 +02:00
2008-07-13 08:19:45 +02:00
2008-04-19 19:19:55 +02:00
2008-07-08 11:31:25 +02:00
2008-07-08 13:10:30 +02:00
2008-06-02 12:48:23 +02:00
2008-05-25 08:58:30 +02:00
2008-05-25 07:09:47 +02:00
2008-04-19 19:19:57 +02:00
2008-06-18 12:27:03 +02:00
2008-07-08 12:48:16 +02:00
2008-04-17 10:42:34 -04:00
2008-07-08 15:49:08 +02:00
2008-06-18 12:27:03 +02:00
2008-07-09 07:43:27 +02:00
2008-04-26 17:35:46 +02:00
2008-06-02 12:48:23 +02:00
2008-06-18 12:27:03 +02:00
2008-06-18 12:27:03 +02:00