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
..
dispatcher	ACPICA: Cleanup debug operand dump mechanism	17 years ago
events	ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space	17 years ago
executer	ACPICA: Cleanup debug operand dump mechanism	17 years ago
hardware	ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space	17 years ago
namespace	ACPICA: Cleanup debug operand dump mechanism	17 years ago
parser	ACPICA: Eliminate acpi_native_uint type v2	17 years ago
resources	ACPICA: Cleanup of _PRT parsing code	17 years ago
sleep	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
tables	Fix FADT parsing	17 years ago
utilities	ACPICA: Fix mutex debug code for wrong loop termination value	17 years ago
Kconfig	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
Makefile	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
ac.c	ACPI: no AC status notification	17 years ago
acpi_memhotplug.c	…
asus_acpi.c	…
battery.c	acpi: use non-racy method for proc entries creation	17 years ago
bay.c	dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.	17 years ago
blacklist.c	…
bus.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
button.c	acpi: use non-racy method for proc entries creation	17 years ago
cm_sbs.c	…
container.c	…
debug.c	…
dock.c	dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.	17 years ago
ec.c	ACPI: EC: Use msleep instead of udelay while waiting for event.	17 years ago
event.c	acpi: use non-racy method for proc entries creation	17 years ago
fan.c	ACPI: fix acpi fan state set error	17 years ago
glue.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
numa.c	ACPICA: Update DMAR and SRAT table definitions	17 years ago
osl.c	…
pci_bind.c	…
pci_irq.c	ACPI: use dev_printk when possible	17 years ago
pci_link.c	…
pci_root.c	…
pci_slot.c	PCI: ACPI PCI slot detection driver	17 years ago
power.c	ACPI: Introduce new device wakeup flag 'prepared'	17 years ago
processor_core.c	ACPI: Disable MWAIT via DMI on broken Compal board	17 years ago
processor_idle.c	ACPI : Create "idle=nomwait" bootparam	17 years ago
processor_perflib.c	ACPI: change processors from array to per_cpu variable	17 years ago
processor_thermal.c	acpi: use non-racy method for proc entries creation	17 years ago
processor_throttling.c	acpi: fix printk format warning	17 years ago
reboot.c	Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.	17 years ago
sbs.c	acpi: use non-racy method for proc entries creation	17 years ago
sbshc.c	…
sbshc.h	…
scan.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
system.c	ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space	17 years ago
tables.c	…
thermal.c	ACPI: Reject below-freezing temperatures as invalid critical temperatures	17 years ago
toshiba_acpi.c	…
utils.c	…
video.c	ACPI: video: fix brightness allocation	17 years ago
wmi.c	…