You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		17 years ago
..
platform	ACPICA: update Intel copyright	17 years ago
acconfig.h	ACPICA: Update version to 20080609	17 years ago
acdebug.h	ACPICA: update Intel copyright	17 years ago
acdisasm.h	ACPICA: Update disassembler for DMAR table changes	17 years ago
acdispat.h	ACPICA: Eliminate acpi_native_uint type v2	17 years ago
acevents.h	ACPICA: update Intel copyright	17 years ago
acexcep.h	ACPICA: Fix possible negative array index in acpi_ut_validate_exception	17 years ago
acglobal.h	ACPICA: Eliminate acpi_native_uint type v2	17 years ago
achware.h	ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space	17 years ago
acinterp.h	ACPICA: Cleanup debug operand dump mechanism	17 years ago
aclocal.h	ACPICA: Add const qualifier for appropriate string constants	17 years ago
acmacros.h	ACPICA: Cleanup debug operand dump mechanism	17 years ago
acnames.h	ACPICA: update Intel copyright	17 years ago
acnamesp.h	ACPICA: Add const qualifier for appropriate string constants	17 years ago
acobject.h	ACPICA: update Intel copyright	17 years ago
acopcode.h	ACPICA: update Intel copyright	17 years ago
acoutput.h	ACPICA: update Intel copyright	17 years ago
acparser.h	ACPICA: update Intel copyright	17 years ago
acpi.h	ACPICA: update Intel copyright	17 years ago
acpi_bus.h	ACPI PM: acpi_pm_device_sleep_state() cleanup	17 years ago
acpi_drivers.h	ACPI: Introduce acpi_device_sleep_wake function	17 years ago
acpi_numa.h	…
acpiosxf.h	ACPICA: Eliminate acpi_native_uint type v2	17 years ago
acpixf.h	ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space	17 years ago
acresrc.h	ACPICA: update Intel copyright	17 years ago
acstruct.h	ACPICA: Eliminate acpi_native_uint type v2	17 years ago
actables.h	ACPICA: Eliminate acpi_native_uint type v2	17 years ago
actbl.h	ACPICA: update Intel copyright	17 years ago
actbl1.h	ACPICA: Update disassembler for DMAR table changes	17 years ago
actypes.h	ACPICA: Eliminate acpi_native_uint type v2	17 years ago
acutils.h	ACPICA: Add const qualifier for appropriate string constants	17 years ago
amlcode.h	ACPICA: update Intel copyright	17 years ago
amlresrc.h	ACPICA: update Intel copyright	17 years ago
container.h	…
pdc_intel.h	…
processor.h	ACPI: change processors from array to per_cpu variable	17 years ago
reboot.h	Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.	17 years ago