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	add mm argument to pte/pmd/pud/pgd_free	17 years ago
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	[PATCH] fix missing ifdefs in syscall classes hookup for generic targets	19 years ago
audit_dir_write.h	[PATCH] fix missing ifdefs in syscall classes hookup for generic targets	19 years ago
audit_read.h	…
audit_signal.h	[PATCH] add SIGNAL syscall class (v3)	18 years ago
audit_write.h	…
bitops.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
bug.h	debug: move WARN_ON() out of line	17 years ago
cmpxchg-local.h	Add cmpxchg_local to asm-generic for per cpu atomic operations	17 years ago
cmpxchg.h	Add cmpxchg_local to asm-generic for per cpu atomic operations	17 years ago
cputime.h	taskstats scaled time cleanup	17 years ago
device.h	Driver core: add dev_archdata to struct device	18 years ago
div64.h	rename div64_64 to div64_u64	17 years ago
dma-mapping-broken.h	dma-mapping: prevent dma dependent code from linking on !HAS_DMA archs	18 years ago
dma-mapping.h	[PATCH] Pass struct dev pointer to dma_cache_sync()	18 years ago
emergency-restart.h	…
errno-base.h	…
errno.h	…
fcntl.h	Introduce O_CLOEXEC	18 years ago
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	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	19 years ago
kdebug.h	move die notifier handling to common code	18 years ago
libata-portmap.h	libata-portmap: Remove unused definitions	18 years ago
local.h	local_t: architecture independent extension	18 years ago
memory_model.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
mm_hooks.h	[PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction	18 years ago
mman.h	[PATCH] Remove final references to deprecated "MAP_ANON" page protection flag	18 years ago
mutex-dec.h	asm-generic: remove fastcall	17 years ago
mutex-null.h	fix file specification in comments	19 years ago
mutex-xchg.h	asm-generic: remove fastcall	17 years ago
page.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
pci-dma-compat.h	…
pci.h	…
percpu.h	percpu: fix DEBUG_PREEMPT per_cpu checking	17 years ago
pgtable-nopmd.h	add mm argument to pte/pmd/pud/pgd_free	17 years ago
pgtable-nopud.h	add mm argument to pte/pmd/pud/pgd_free	17 years ago
pgtable.h	mm: fix build on non-mmu machines	17 years ago
poll.h	Consolidate asm/poll.h	18 years ago
resource.h	sched: SCHED_FIFO/SCHED_RR watchdog timer	17 years ago
rtc.h	remove __KERNEL__ tests of unexported headers under asm-generic/	17 years ago
sections.h	remove support for un-needed _extratext section	17 years ago
siginfo.h	…
signal.h	…
statfs.h	…
termios.h	tty: let architectures override the user/kernel macros.	17 years ago
tlb.h	asm-generic/tlb.h: remove <linux/quicklist.h>	17 years ago
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	…