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 4406c56d0a 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: (75 commits) PCI hotplug: clean up acpi_run_hpp() PCI hotplug: acpiphp: use generic pci_configure_slot() PCI hotplug: shpchp: use generic pci_configure_slot() PCI hotplug: pciehp: use generic pci_configure_slot() PCI hotplug: add pci_configure_slot() PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation PCI: Clear saved_state after the state has been restored PCI PM: Return error codes from pci_pm_resume() PCI: use dev_printk in quirk messages PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset() PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle PCI Hotplug: acpiphp: find bridges the easy way PCI: pcie portdrv: remove unused variable PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support ACPI PM: Replace wakeup.prepared with reference counter PCI PM: Introduce device flag wakeup_prepared PCI / ACPI PM: Rework some debug messages PCI PM: Simplify PCI wake-up code ... Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree scanning having been moved and merged for the 32- and 64-bit cases. The 'needs_freset' initialization added in 6e19314cc ("PCI/powerpc: support PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.		16 years ago
..
native	ia64/pv_ops: paravirtualize gate.S.	16 years ago
sn	[IA64] Convert ia64 to use int-ll64.h	16 years ago
uv	sgi-gru: add macros for using the UV hub to send interrupts	16 years ago
xen	Fix ia64 compilation IS_ERR and PTE_ERR errors.	16 years ago
Kbuild	[IA64] unexport fpswa.h	16 years ago
acpi-ext.h	…
acpi.h	…
agp.h	agp: kill phys_to_gart() and gart_to_phys()	16 years ago
asmmacro.h	…
atomic.h	asm-generic: rename atomic.h to atomic-long.h	16 years ago
auxvec.h	…
bitops.h	ia64: boolean __test_and_clear_bit	16 years ago
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	16 years ago
break.h	…
bug.h	…
bugs.h	…
byteorder.h	…
cache.h	…
cacheflush.h	…
checksum.h	…
compat.h	…
cpu.h	…
cputime.h	…
current.h	…
cyclone.h	…
delay.h	…
device.h	Driver Core: Add platform device arch data V3	16 years ago
div64.h	…
dma-mapping.h	IA64: Remove NULL flush_write_buffers	16 years ago
dma.h	…
dmi.h	…
elf.h	…
emergency-restart.h	…
errno.h	…
esi.h	…
fb.h	…
fcntl.h	…
fpswa.h	…
fpu.h	Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"	16 years ago
ftrace.h	…
futex.h	…
gcc_intrin.h	[IA64] Convert ia64 to use int-ll64.h	16 years ago
hardirq.h	…
hpsim.h	…
hugetlb.h	…
hw_irq.h	[IA64] remove obsolete hw_interrupt_type	16 years ago
ia32.h	…
ia64regs.h	…
idle.h	[IA64] xen_domu_defconfig: fix build issues/warnings	16 years ago
intel_intrin.h	…
intrinsics.h	Pull pvops into release branch	16 years ago
io.h	…
ioctl.h	…
ioctls.h	…
iommu.h	intel-iommu: Fix one last ia64 build problem in Pass Through Support	16 years ago
iosapic.h	…
ipcbuf.h	…
irq.h	…
irq_regs.h	…
kdebug.h	…
kexec.h	…
kmap_types.h	kmap_types: make most arches use generic header file	16 years ago
kprobes.h	…
kregs.h	…
kvm.h	Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	16 years ago
kvm_host.h	KVM: Prepare memslot data structures for multiple hugepage sizes	16 years ago
kvm_para.h	KVM: Add __KERNEL__ guards to exported headers	16 years ago
libata-portmap.h	…
linkage.h	…
local.h	…
machvec.h	…
machvec_dig.h	…
machvec_dig_vtd.h	…
machvec_hpsim.h	…
machvec_hpzx1.h	…
machvec_hpzx1_swiotlb.h	…
machvec_init.h	…
machvec_sn2.h	…
machvec_uv.h	…
machvec_xen.h	…
mc146818rtc.h	…
mca.h	[IA64] Convert ia64 to use int-ll64.h	16 years ago
mca_asm.h	…
meminit.h	[IA64] Convert ia64 to use int-ll64.h	16 years ago
mman.h	asm-generic: rename termios.h, signal.h and mman.h	16 years ago
mmu.h	…
mmu_context.h	cpumask: use mm_cpumask() wrapper: ia64	16 years ago
mmzone.h	mm: clean up for early_pfn_to_nid()	16 years ago
module.h	ia64/pv_ops/bp/module: support binary patching for kernel module.	16 years ago
msgbuf.h	…
msidef.h	ia64: Move the macro definitions related to MSI to one header file.	16 years ago
mutex.h	…
nodedata.h	…
numa.h	…
page.h	…
pal.h	[IA64] Convert ia64 to use int-ll64.h	16 years ago
param.h	…
paravirt.h	ia64/pv_ops: implement binary patching optimization for native.	16 years ago
paravirt_patch.h	ia64/pv_op/binarypatch: add helper functions to support binary patching for paravirt_ops.	16 years ago
paravirt_privop.h	[IA64] fix allmodconfig compilation breakage.	16 years ago
parport.h	…
patch.h	…
pci.h	PCI: remove pcibios_scan_all_fns()	16 years ago
percpu.h	…
perfmon.h	…
perfmon_default_smpl.h	…
pgalloc.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	16 years ago
pgtable.h	IA64: includecheck fix: ia64, pgtable.h	16 years ago
poll.h	…
posix_types.h	…
processor.h	[IA64] Convert ia64 to use int-ll64.h	16 years ago
ptrace.h	…
ptrace_offsets.h	…
pvclock-abi.h	…
resource.h	…
rse.h	…
rwsem.h	…
sal.h	[IA64] Convert ia64 to use int-ll64.h	16 years ago
scatterlist.h	…
sections.h	…
segment.h	…
sembuf.h	…
serial.h	…
setup.h	…
shmbuf.h	…
shmparam.h	…
sigcontext.h	…
siginfo.h	…
signal.h	asm-generic: rename termios.h, signal.h and mman.h	16 years ago
smp.h	FRV: Fix the section attribute on UP DECLARE_PER_CPU()	16 years ago
socket.h	net: implement a SO_DOMAIN getsockoption	16 years ago
sockios.h	…
sparsemem.h	…
spinlock.h	ia64: implement interrupt-enabling rwlocks	16 years ago
spinlock_types.h	…
stat.h	…
statfs.h	…
string.h	…
swab.h	…
swiotlb.h	…
sync_bitops.h	…
syscall.h	…
system.h	…
termbits.h	…
termios.h	…
thread_info.h	sched: INIT_PREEMPT_COUNT	16 years ago
timex.h	ia64/pv_ops/pv_time_ops: add sched_clock hook.	16 years ago
tlb.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	16 years ago
tlbflush.h	…
topology.h	Pull cpumask into release branch	16 years ago
types.h	[IA64] Convert ia64 to use int-ll64.h	16 years ago
uaccess.h	…
ucontext.h	…
unaligned.h	…
uncached.h	…
unistd.h	[IA64] ia64 does not need umount2() syscall	16 years ago
unwind.h	…
user.h	…
ustack.h	…
vga.h	…
xor.h	…