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
..
bitops	bitops: use __fls for fls64 on 64-bit archs	17 years ago
4level-fixup.h	…
Kbuild	types: create <asm-generic/int-*.h>	17 years ago
Kbuild.asm	kbuild: fix a.out.h export to userspace with O= build.	17 years ago
atomic.h	Christoph has moved	17 years ago
audit_change_attr.h	…
audit_dir_write.h	…
audit_read.h	…
audit_signal.h	…
audit_write.h	…
bitops.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
bug.h	…
cmpxchg-local.h	…
cmpxchg.h	…
cputime.h	…
device.h	…
div64.h	rename div64_64 to div64_u64	17 years ago
dma-mapping-broken.h	…
dma-mapping.h	…
emergency-restart.h	…
errno-base.h	…
errno.h	…
fcntl.h	…
futex.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
gpio.h	gpio: build fixes	17 years ago
ide_iops.h	…
int-l64.h	types: add C99-style constructors to <asm-generic/int-*.h>	17 years ago
int-ll64.h	types: add C99-style constructors to <asm-generic/int-*.h>	17 years ago
ioctl.h	generalize asm-generic/ioctl.h to allow overriding values	17 years ago
iomap.h	generic: add ioremap_wc() interface wrapper	17 years ago
irq_regs.h	…
kdebug.h	…
libata-portmap.h	…
local.h	…
memory_model.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
mm_hooks.h	…
mman.h	…
mutex-dec.h	…
mutex-null.h	…
mutex-xchg.h	…
page.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
pci-dma-compat.h	…
pci.h	…
percpu.h	…
pgtable-nopmd.h	…
pgtable-nopud.h	…
pgtable.h	mm: fix build on non-mmu machines	17 years ago
poll.h	…
resource.h	…
rtc.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
sections.h	…
siginfo.h	…
signal.h	…
statfs.h	…
termios.h	…
tlb.h	…
topology.h	x86: change _node_to_cpumask_ptr to return const ptr	17 years ago
uaccess.h	…
vmlinux.lds.h	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
xor.h	…