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