David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	arch/microblaze/include/asm/socket.h

2009-08-12 17:44:53 -07:00

..

native

ia64/pv_ops: paravirtualize gate.S.

2009-03-26 11:01:46 -07:00

sn

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

uv

sgi-gru: add macros for using the UV hub to send interrupts

2009-04-02 19:05:05 -07:00

xen

Fix ia64 compilation IS_ERR and PTE_ERR errors.

2009-07-17 06:34:50 -07:00

acpi-ext.h

ACPI: remove private acpica headers from driver files

2008-12-31 01:15:22 -05:00

acpi.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

agp.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

asmmacro.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

atomic.h

asm-generic: rename atomic.h to atomic-long.h

2009-06-11 21:02:17 +02:00

auxvec.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

bitops.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

bitsperlong.h

asm-generic: introduce asm/bitsperlong.h

2009-06-11 21:02:14 +02:00

break.h

ia64/xen: reserve "break" numbers used for xen hypercalls.

2008-10-17 09:52:52 -07:00

bug.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

bugs.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

byteorder.h

byteorder: make swab.h include asm/swab.h like a regular header

2009-01-14 19:56:50 -08:00

cache.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cacheflush.h

[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU

2008-10-17 12:14:13 -07:00

checksum.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

compat.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cpu.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cputime.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

current.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cyclone.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

delay.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

device.h

[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU

2008-10-17 12:14:13 -07:00

div64.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

dma-mapping.h

dma-mapping: ia64: add CONFIG_DMA_API_DEBUG support

2009-06-18 13:03:58 -07:00

dma.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

dmi.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

elf.h

[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY

2008-10-16 15:40:05 +02:00

emergency-restart.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

errno.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

esi.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fb.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fcntl.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fpswa.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fpu.h

Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"

2009-07-17 06:35:05 -07:00

ftrace.h

ftrace, ia64: IA64 dynamic ftrace support

2009-01-14 12:11:31 +01:00

futex.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

gcc_intrin.h

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

hardirq.h

preempt-count: force hardirq-count to max of 10

2009-02-12 11:19:05 -05:00

hpsim.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

hugetlb.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

hw_irq.h

[IA64] remove obsolete hw_interrupt_type

2009-06-15 14:35:10 -07:00

ia32.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ia64regs.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

idle.h

[IA64] xen_domu_defconfig: fix build issues/warnings

2009-05-05 11:43:13 -07:00

intel_intrin.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

intrinsics.h

Pull pvops into release branch

2009-03-31 14:25:08 -07:00

io.h

[IA64] remove dead BIO_VMERGE_BOUNDARY definition

2008-11-04 11:31:58 -08:00

ioctl.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ioctls.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

iommu.h

intel-iommu: Fix one last ia64 build problem in Pass Through Support

2009-06-05 20:49:53 +01:00

iosapic.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ipcbuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

irq_regs.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

irq.h

ia64: cpumask fix for is_affinity_mask_valid()

2009-01-04 15:39:24 +01:00

Kbuild

[IA64] unexport fpswa.h

2009-06-15 14:32:54 -07:00

kdebug.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

kexec.h

kexec jump: rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE

2008-08-15 08:35:42 -07:00

kmap_types.h

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

kprobes.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

kregs.h

[IA64] Fix annoying IA64_TR_ALLOC_MAX message.

2008-10-17 13:47:53 -07:00

kvm_host.h

KVM: Enable snooping control for supported hardware

2009-06-10 11:48:50 +03:00

kvm_para.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

kvm.h

Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-03-26 16:11:41 -07:00

libata-portmap.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

linkage.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

local.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_dig_vtd.h

remove dma operations in struct ia64_machine_vector

2009-01-06 14:06:50 +01:00

machvec_dig.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_hpsim.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_hpzx1_swiotlb.h

remove hwsw_dma_ops

2009-01-06 14:06:52 +01:00

machvec_hpzx1.h

remove dma operations in struct ia64_machine_vector

2009-01-06 14:06:50 +01:00

machvec_init.h

[IA64] SN specific version of dma_get_required_mask()

2009-01-15 10:42:16 -08:00

machvec_sn2.h

Merge branch 'linus' into core/iommu

2009-01-16 10:09:10 +01:00

machvec_uv.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_xen.h

ia64/xen: define xen machine vector for domU.

2008-10-17 10:08:56 -07:00

machvec.h

Merge branch 'linus' into core/iommu

2009-01-16 10:09:10 +01:00

mc146818rtc.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mca_asm.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mca.h

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

meminit.h

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

mman.h

asm-generic: rename termios.h, signal.h and mman.h

2009-06-11 21:01:52 +02:00

mmu_context.h

cpumask: use mm_cpumask() wrapper: ia64

2009-03-16 14:12:48 +10:30

mmu.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mmzone.h

mm: clean up for early_pfn_to_nid()

2009-02-18 15:37:55 -08:00

module.h

ia64/pv_ops/bp/module: support binary patching for kernel module.

2009-03-26 11:02:51 -07:00

msgbuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

msidef.h

ia64: Move the macro definitions related to MSI to one header file.

2009-03-24 11:03:12 +02:00

mutex.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

nodedata.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

numa.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

page.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

pal.h

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

param.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

paravirt_patch.h

ia64/pv_op/binarypatch: add helper functions to support binary patching for paravirt_ops.

2009-03-26 11:02:31 -07:00

paravirt_privop.h

[IA64] fix allmodconfig compilation breakage.

2009-04-20 09:46:29 -07:00

paravirt.h

ia64/pv_ops: implement binary patching optimization for native.

2009-03-26 11:02:42 -07:00

parport.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

patch.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

pci.h

Delete pcibios_select_root

2009-06-17 14:04:42 -07:00

percpu.h

percpu: make PER_CPU_BASE_SECTION overridable by arches

2009-02-09 10:30:29 +01:00

perfmon_default_smpl.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

perfmon.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

pgalloc.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

pgtable.h

KVM: ia64: Map in SN2 RTC registers to the VMM module

2009-06-10 11:48:28 +03:00

poll.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

posix_types.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

processor.h

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

ptrace_offsets.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ptrace.h

remove __ARCH_WANT_COMPAT_SYS_PTRACE

2008-11-30 11:00:15 -08:00

pvclock-abi.h

ia64/xen: add a necessary header file to compile include/xen/interface/xen.h

2008-10-17 09:57:28 -07:00

resource.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

rse.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

rwsem.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sal.h

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

scatterlist.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sections.h

[IA64] Put the space for cpu0 per-cpu area into .data section

2008-09-29 16:39:19 -07:00

segment.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sembuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

serial.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

setup.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

shmbuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

shmparam.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sigcontext.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

siginfo.h

signals: demultiplexing SIGTRAP signal

2008-09-23 13:26:52 +02:00

signal.h

asm-generic: rename termios.h, signal.h and mman.h

2009-06-11 21:01:52 +02:00

smp.h

FRV: Fix the section attribute on UP DECLARE_PER_CPU()

2009-04-21 19:39:59 -07:00

socket.h

net: implement a SO_DOMAIN getsockoption

2009-08-05 13:02:57 -07:00

sockios.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sparsemem.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

spinlock_types.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

spinlock.h

ia64: implement interrupt-enabling rwlocks

2009-04-02 19:05:11 -07:00

stat.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

statfs.h

IA64: Use <asm-generic/statfs.h>

2008-09-04 09:46:13 +01:00

string.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

swab.h

headers_check fix: ia64, swab.h

2009-02-01 11:01:25 +05:30

swiotlb.h

swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h

2008-12-28 10:04:00 +01:00

sync_bitops.h

ia64/xen: introduce sync bitops which is necessary for ia64/xen support.

2008-10-17 09:53:33 -07:00

syscall.h

[IA64] utrace Convert compat ptrace to use compat_sys_ptrace

2008-10-06 10:45:29 -07:00

system.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

termbits.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

termios.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

thread_info.h

sched: INIT_PREEMPT_COUNT

2009-07-10 14:24:05 -07:00

timex.h

ia64/pv_ops/pv_time_ops: add sched_clock hook.

2009-03-26 10:50:42 -07:00

tlb.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

tlbflush.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

topology.h

Pull cpumask into release branch

2009-03-31 14:24:52 -07:00

types.h

[IA64] Convert ia64 to use int-ll64.h

2009-06-17 09:33:49 -07:00

uaccess.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ucontext.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

unaligned.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

uncached.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

unistd.h

[IA64] ia64 does not need umount2() syscall

2009-06-16 13:13:50 -07:00

unwind.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

user.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ustack.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

vga.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

xor.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00