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
..
acpi_pcihp.c
shpchp: check firmware before taking control
2008-06-10 10:59:53 -07:00
acpiphp.h
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
acpiphp_core.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
acpiphp_glue.c
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2008-07-16 17:25:46 -07:00
acpiphp_ibm.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
cpci_hotplug.h
[PATCH] PCI Hotplug: CPCI update
2005-05-17 14:31:11 -07:00
cpci_hotplug_core.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
cpci_hotplug_pci.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
cpcihp_generic.c
PCI Hotplug: make cpcihp driver use modern apis
2008-04-20 21:46:56 -07:00
cpcihp_zt5550.c
PCI: ZT5550 CPCI Hotplug driver fix
2007-05-02 19:02:40 -07:00
cpcihp_zt5550.h
Linux-2.6.12-rc2
2005-04-16 15:20:36 -07:00
cpqphp.h
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
cpqphp_core.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
cpqphp_ctrl.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
cpqphp_nvram.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
cpqphp_nvram.h
Linux-2.6.12-rc2
2005-04-16 15:20:36 -07:00
cpqphp_pci.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
cpqphp_sysfs.c
[PATCH] mark struct file_operations const 5
2007-02-12 09:48:45 -08:00
fakephp.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
ibmphp.h
PCI Hotplug: move pci_hotplug.h to include/linux/
2006-10-18 11:36:12 -07:00
ibmphp_core.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
ibmphp_ebda.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
ibmphp_hpc.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
ibmphp_pci.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
ibmphp_res.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
Kconfig
PCI Hotplug: the ibm driver is not dependant on PCI_LEGACY
2008-04-20 21:46:57 -07:00
Makefile
PCI: hotplug: Link fakephp last
2008-02-01 15:04:20 -08:00
pci_hotplug_core.c
Remove unnecessary 'tmp' variable from pci_hp_register().
2008-06-25 15:58:39 -07:00
pciehp.h
PCI: remove unnecessary volatile in PCIe hotplug struct controller
2008-07-16 08:46:43 -07:00
pciehp_core.c
pciehp: use get_service_data
2008-06-27 13:01:14 -07:00
pciehp_ctrl.c
pciehp: move msleep after power off
2008-05-27 15:43:33 -07:00
pciehp_hpc.c
pciehp: remove needless command completed interrupt setting
2008-06-27 13:01:03 -07:00
pciehp_pci.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
pcihp_skeleton.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
rpadlpar.h
Linux-2.6.12-rc2
2005-04-16 15:20:36 -07:00
rpadlpar_core.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
rpadlpar_sysfs.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
rpaphp.h
pci hotplug: fix rpaphp directory naming
2008-02-01 15:04:22 -08:00
rpaphp_core.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
rpaphp_pci.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
rpaphp_slot.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
sgi_hotplug.c
PCI: ACPI PCI slot detection driver
2008-06-10 14:37:14 -07:00
shpchp.h
shpchp: check firmware before taking control
2008-06-10 10:59:53 -07:00
shpchp_core.c
PCI: introduce pci_slot
2008-06-10 14:37:03 -07:00
shpchp_ctrl.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
shpchp_hpc.c
shpchp: check firmware before taking control
2008-06-10 10:59:53 -07:00
shpchp_pci.c
PCI: replace remaining __FUNCTION__ occurrences
2008-04-20 21:47:09 -07:00
shpchp_sysfs.c
SHPCHP: fix __must_check warnings
2006-09-26 17:43:53 -07:00