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
..
power	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
attribute_container.c	SCSI: convert struct class_device to struct device	2008-04-19 19:10:33 -07:00
base.h	driver core: remove no longer used "struct class_device"	2008-04-30 16:52:49 -07:00
bus.c	bus_remove_device: be more careful about incomplete initialization	2008-04-22 17:40:36 -07:00
class.c	Driver core: struct class remove children list	2008-05-14 10:37:58 -07:00
core.c	dev_set_name: fix missing kernel-doc	2008-06-11 16:50:40 -07:00
cpu.c	cpu: change cpu_sys_devices from array to per_cpu variable	2008-05-01 08:04:02 -07:00
dd.c	driver core: replace remaining __FUNCTION__ occurrences	2008-04-19 19:10:29 -07:00
devres.c
dma-mapping.c
driver.c	driver core: warn about duplicate driver names on the same bus	2008-04-30 16:52:47 -07:00
firmware_class.c	firmware: allow firmware files to be built into kernel image	2008-07-10 14:30:13 +01:00
firmware.c
hypervisor.c
init.c
isa.c
Kconfig	firmware: Add CONFIG_FIRMWARE_IN_KERNEL option.	2008-07-10 14:47:20 +01:00
Makefile
map.c
memory.c	memory: Introduce exports for memory notifiers	2008-05-13 01:31:38 -04:00
module.c
node.c	mm: switch node meminfo Active & Inactive pages to Kbytes	2008-07-04 10:40:09 -07:00
platform.c	Implement new suspend and hibernation callbacks for platform busses	2008-06-10 10:59:51 -07:00
sys.c	Fix bogus warning in sysdev_driver_register()	2008-05-06 13:22:42 -07:00
topology.c	Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-15 10:32:39 -07:00
transport_class.c	SCSI: convert struct class_device to struct device	2008-04-19 19:10:33 -07:00