Bjorn Helgaas 295a7f6235
Merge branch 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into pci/yinghai-survey-resources+acpi-scan ...
* 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / scan: Treat power resources in a special way
ACPI: Remove unused struct acpi_pci_root.id member
ACPI: Drop ACPI device .bind() and .unbind() callbacks
ACPI / PCI: Move the _PRT setup and cleanup code to pci-acpi.c
ACPI / PCI: Rework the setup and cleanup of device wakeup
ACPI: Add .setup() and .cleanup() callbacks to struct acpi_bus_type
ACPI: Make acpi_bus_scan() and acpi_bus_add() take only one argument
ACPI: Replace ACPI device add_type field with a match_driver flag
ACPI: Drop the second argument of acpi_bus_scan()
ACPI: Remove the arguments of acpi_bus_add() that are not used
ACPI: Remove acpi_start_single_object() and acpi_bus_start()
ACPI / PCI: Fold acpi_pci_root_start() into acpi_pci_root_add()
ACPI: Change the ordering of acpi_bus_check_add()
ACPI: Replace struct acpi_bus_ops with enum type
ACPI: Reduce the usage of struct acpi_bus_ops
ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different
ACPI: Change the ordering of PCI root bridge driver registrarion
ACPI: Separate adding ACPI device objects from probing ACPI drivers
Conflicts:
drivers/acpi/pci_root.c
2013-01-10 11:18:41 -07:00
2012-12-03 11:15:35 +00:00
2012-12-19 12:47:41 -08:00
2012-12-20 14:00:13 -08:00
2012-12-14 14:54:26 -08:00
2013-01-02 17:36:10 -08:00
2012-12-18 16:51:10 -08:00
2012-12-18 12:46:37 -08:00
2012-12-14 14:42:53 -08:00
2012-12-16 18:55:20 -08:00
2012-12-19 11:47:22 -08:00
2012-12-11 11:19:09 -08:00
2012-12-03 16:36:52 +02:00
2012-11-30 12:01:30 -05:00
2012-12-20 10:07:25 -08:00
2012-12-13 19:26:04 -08:00
2013-01-02 17:36:10 -08:00
2012-12-10 12:43:22 +09:00
2012-12-07 17:02:47 +00:00
2012-12-14 14:27:45 -08:00
2012-12-20 14:04:11 -08:00
2013-01-02 17:36:10 -08:00
2012-11-30 12:37:36 +01:00
2013-01-03 13:09:41 +01:00
2012-12-14 13:06:41 +10:30
2012-12-03 05:15:33 -05:00
2012-12-14 09:34:01 -05:00
2012-12-10 15:49:57 -05:00
2012-12-02 00:05:12 +00:00
2012-12-17 11:29:09 -08:00
2012-12-17 17:15:16 -08:00
2012-12-11 17:22:26 -08:00
2012-12-06 14:58:56 -05:00
2012-12-20 20:00:43 -08:00
2012-12-19 07:18:35 -08:00
2012-12-12 17:38:35 -08:00
2012-12-06 14:33:02 +01:00
2012-11-26 17:41:24 -08:00
2012-12-11 11:25:08 -08:00
2012-12-20 18:05:28 -08:00
2012-12-19 07:55:08 -08:00
2012-12-06 01:22:31 +00:00
2012-12-19 07:55:08 -08:00
2012-11-30 11:40:07 -08:00
2012-11-29 00:01:25 -05:00
2012-11-22 15:59:52 +08:00
2012-12-12 17:38:32 -08:00
2012-12-17 15:44:47 -08:00
2012-12-20 13:57:36 -05:00
2012-11-26 19:17:44 +09:00
2012-12-21 20:23:41 +00:00
2012-12-14 09:59:59 -08:00
2012-11-29 03:30:34 -08:00
2012-12-20 12:05:06 +05:30
2012-12-11 09:28:09 +01:00
2012-11-28 11:54:40 +01:00
2012-12-15 15:20:41 -08:00
2012-12-20 14:04:11 -08:00
2012-11-22 13:43:27 +09:00
2012-12-11 13:43:45 +09:00
2012-11-28 21:49:02 -05:00
2012-12-12 08:18:24 -08:00
2012-11-28 21:49:02 -05:00
2012-12-20 18:49:14 -05:00
2012-12-20 22:34:00 +00:00
2012-12-20 22:04:07 +00:00
2012-11-26 13:41:19 -06:00
2012-12-11 13:44:36 -05:00
2012-12-17 17:15:12 -08:00
2012-11-23 14:28:53 +01:00
2012-12-18 15:02:12 -08:00
2012-12-06 10:39:54 +01:00
2012-12-12 16:49:10 +01:00
2012-12-12 21:41:55 +01:00
2012-12-16 15:18:08 -08:00
2012-12-18 15:02:15 -08:00
2012-12-16 15:18:08 -08:00
2012-11-28 11:36:32 +01:00
2012-11-23 12:23:40 +01:00
2012-12-06 14:02:51 +01:00
2012-12-14 13:05:26 +10:30
2012-12-04 13:08:10 -05:00
2012-12-17 17:15:12 -08:00
2012-12-09 00:20:28 -05:00
2012-11-21 15:09:26 -08:00
2012-12-09 00:20:28 -05:00
2012-12-13 14:20:19 -08:00
2012-12-25 13:29:52 -05:00
2012-12-20 17:40:20 -08:00
2012-12-16 15:40:50 -08:00
2012-11-28 10:33:03 -08:00
2012-12-13 15:31:08 -08:00
2012-11-26 14:28:51 -08:00
2012-12-03 05:15:17 -05:00
2012-11-30 11:48:05 +01:00
2012-12-17 13:39:11 -08:00
2012-12-18 15:02:15 -08:00
2012-12-11 17:22:28 -08:00
2012-12-12 17:38:33 -08:00
2013-01-02 17:32:13 -08:00
2012-11-23 14:29:51 -05:00
2012-12-16 15:18:08 -08:00
2012-12-01 10:07:54 +00:00
2012-12-18 10:56:07 -08:00
2012-12-20 18:46:29 -05:00
2012-12-16 15:18:08 -08:00
2012-12-14 13:06:40 +10:30
2012-12-20 18:50:02 -05:00
2012-12-21 13:14:01 -08:00
2012-12-06 00:30:46 +01:00
2012-12-15 15:21:52 -05:00
2012-12-11 17:22:27 -08:00
2012-12-12 17:38:34 -08:00
2012-11-23 22:01:15 +00:00
2012-12-11 17:30:16 +00:00
2012-12-19 16:15:17 +00:00
2012-12-18 09:58:09 -08:00
2012-11-30 08:41:50 -08:00
2012-12-11 17:22:27 -08:00
2012-11-26 11:33:18 -08:00
2012-12-26 14:57:34 -08:00
2012-12-11 17:22:22 -08:00
2012-12-11 17:22:26 -08:00
2012-12-26 10:43:06 -07:00
2013-01-07 15:58:48 -07:00
2012-12-17 17:15:18 -08:00
2012-12-25 16:10:05 -08:00
2012-12-25 16:10:05 -08:00
2012-12-17 20:58:12 -08:00
2012-11-26 16:07:44 -08:00
2012-12-20 18:05:28 -08:00
2012-11-27 23:29:12 -02:00
2012-11-22 22:47:12 +01:00
2012-12-17 17:15:26 -08:00
2012-11-30 11:40:07 -08:00
2012-12-11 12:39:32 +09:00
2012-12-18 15:02:12 -08:00
2012-12-11 14:43:00 +00:00
2012-12-20 18:05:28 -08:00
2012-12-14 13:05:24 +10:30
2012-12-11 17:22:25 -08:00
2012-12-19 18:07:41 -05:00
2012-12-09 00:20:28 -05:00
2012-12-18 15:02:13 -08:00
2012-12-18 15:02:14 -08:00
2012-12-18 15:02:14 -08:00
2012-12-07 12:48:00 -05:00
2012-12-13 12:00:02 -08:00
2012-12-17 17:15:17 -08:00
2012-12-20 18:05:28 -08:00
2012-12-09 00:20:28 -05:00
2012-12-12 15:34:48 +08:00
2012-12-18 15:02:13 -08:00
2012-12-11 17:22:27 -08:00
2012-12-09 00:20:28 -05:00
2012-12-18 15:20:43 +10:30
2012-12-16 15:18:08 -08:00
2012-12-11 14:42:48 +00:00
2012-11-30 11:47:57 +01:00
2012-12-19 22:24:55 +01:00
2012-12-11 17:22:21 -08:00
295a7f6235