dc7c65db28
* '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. |
||
|---|---|---|
| .. | ||
| bitops | ||
| 4level-fixup.h | ||
| Kbuild | ||
| Kbuild.asm | ||
| atomic.h | ||
| audit_change_attr.h | ||
| audit_dir_write.h | ||
| audit_read.h | ||
| audit_signal.h | ||
| audit_write.h | ||
| bitops.h | ||
| bug.h | ||
| cmpxchg-local.h | ||
| cmpxchg.h | ||
| cputime.h | ||
| device.h | ||
| div64.h | ||
| dma-mapping-broken.h | ||
| dma-mapping.h | ||
| emergency-restart.h | ||
| errno-base.h | ||
| errno.h | ||
| fcntl.h | ||
| futex.h | ||
| gpio.h | ||
| ide_iops.h | ||
| int-l64.h | ||
| int-ll64.h | ||
| ioctl.h | ||
| iomap.h | ||
| irq_regs.h | ||
| kdebug.h | ||
| libata-portmap.h | ||
| local.h | ||
| memory_model.h | ||
| mm_hooks.h | ||
| mman.h | ||
| mutex-dec.h | ||
| mutex-null.h | ||
| mutex-xchg.h | ||
| page.h | ||
| pci-dma-compat.h | ||
| pci.h | ||
| percpu.h | ||
| pgtable-nopmd.h | ||
| pgtable-nopud.h | ||
| pgtable.h | ||
| poll.h | ||
| resource.h | ||
| rtc.h | ||
| sections.h | ||
| siginfo.h | ||
| signal.h | ||
| statfs.h | ||
| termios.h | ||
| tlb.h | ||
| topology.h | ||
| uaccess.h | ||
| vmlinux.lds.h | ||
| xor.h | ||