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