David Woodhouse 66643de455 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	include/asm-powerpc/unistd.h
	include/asm-sparc/unistd.h
	include/asm-sparc64/unistd.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

2006-05-24 09:22:21 +01:00

..

sn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-04-29 01:42:26 +01:00

a.out.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

acpi-ext.h

[IA64] update HP CSR space discovery via ACPI

2006-04-06 14:42:38 -07:00

acpi.h

[IA64] - Fix MAX_PXM_DOMAINS for systems with > 256 nodes

2006-04-20 10:16:11 -07:00

agp.h

[PATCH] AGP fix for Xen VMM

2005-06-07 12:35:43 -07:00

asmmacro.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

atomic.h

[PATCH] atomic: add_unless cmpxchg optimise

2006-03-23 07:38:17 -08:00

auxvec.h

[PATCH] auxiliary vector cleanups

2005-09-07 16:57:21 -07:00

bitops.h

[IA64] remove asm-ia64/bitops.h self-inclusion

2006-05-05 11:37:15 -07:00

break.h

[PATCH] Kprobes/IA64: kdebug die notification mechanism

2005-06-23 09:45:22 -07:00

bug.h

[PATCH] remove gcc-2 checks

2006-01-08 20:14:02 -08:00

bugs.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

byteorder.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cache.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

cacheflush.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

checksum.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

compat.h

[PATCH] ia64: add ptr_to_compat()

2006-03-27 08:44:48 -08:00

cpu.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cputime.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

current.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cyclone.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

delay.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

div64.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

dma-mapping.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

dma.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

dmi.h

[PATCH] ia64: use i386 dmi_scan.c

2006-03-26 08:56:54 -08:00

elf.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

emergency-restart.h

[PATCH] Add emergency_restart()

2005-07-26 14:35:41 -07:00

errno.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

fcntl.h

[PATCH] Clean up struct flock definitions

2005-09-07 16:57:38 -07:00

fpswa.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

fpu.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

futex.h

[PATCH] consolidate asm/futex.h

2006-01-08 20:13:39 -08:00

gcc_intrin.h

[IA64] fix fls()

2005-04-21 11:07:59 -07:00

hardirq.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

hw_irq.h

[PATCH] x86/x86_64: deferred handling of writes to /proc/irqxx/smp_affinity

2005-09-07 16:57:15 -07:00

ia32.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ia64regs.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ide.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

intel_intrin.h

[IA64] use icc defined constant

2006-02-07 08:49:27 -08:00

intrinsics.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

io.h

[PATCH] ia64: ioremap: check EFI for valid memory attributes

2006-03-26 08:56:54 -08:00

ioctl.h

[PATCH] Generic ioctl.h

2006-01-10 08:01:34 -08:00

ioctls.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

iosapic.h

[IA64] Minor cleanups - remove unnecessary function prototype in iosapic.h

2005-09-07 14:00:40 -07:00

ipcbuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

irq.h

[IA64] Manual merge fix for 3 files

2005-09-08 14:27:13 -07:00

kdebug.h

[IA64] Pass more data to the MCA/INIT notify_die hooks

2006-04-07 22:51:51 -07:00

kmap_types.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

kprobes.h

[IA64] prevent accidental modification of args in jprobe handler

2006-01-13 14:45:21 -08:00

kregs.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

linkage.h

[PATCH] abstract type/size specification for assembly

2006-03-24 07:33:25 -08:00

local.h

[IA64] Fix missing parameter for local_add/sub

2005-12-07 11:30:11 -08:00

machvec_dig.h

[IA64] cleanup dig_irq_init

2006-03-24 13:12:46 -08:00

machvec_hpsim.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

machvec_hpzx1_swiotlb.h

[IA64] more robust zx1/sx1000 machvec support

2005-09-14 16:22:11 -07:00

machvec_hpzx1.h

[IA64] more robust zx1/sx1000 machvec support

2005-09-14 16:22:11 -07:00

machvec_init.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

machvec_sn2.h

Pull sn2-mmio-writes into release branch

2006-03-21 08:21:26 -08:00

machvec.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-04-29 01:42:26 +01:00

mc146818rtc.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

mca_asm.h

[PATCH] MCA/INIT: use per cpu stacks

2005-09-11 14:08:41 -07:00

mca.h

[IA64] Pass more data to the MCA/INIT notify_die hooks

2006-04-07 22:51:51 -07:00

meminit.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

mman.h

[PATCH] add asm-generic/mman.h

2006-02-15 15:32:22 -08:00

mmu_context.h

[IA64] make mmu_context.h and tlb.c 80-column friendly

2005-11-03 14:43:50 -08:00

mmu.h

[IA64] Fix race in mm-context wrap-around logic.

2005-08-12 15:05:21 -07:00

mmzone.h

[PATCH] V5 ia64 SPARSEMEM - conditional changes for SPARSEMEM

2005-10-04 13:21:13 -07:00

module.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

msgbuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

msi.h

[PATCH] PCI: Change MSI to use physical delivery mode always

2005-11-10 16:09:18 -08:00

mutex.h

[IA64] fix bug in ia64 __mutex_fastpath_trylock

2006-04-07 22:39:49 -07:00

namei.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nodedata.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

numa.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

page.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

pal.h

[IA64] Avoid "u64 foo : 32;" for gcc3 vs. gcc4 compatibility

2006-03-31 10:28:29 -08:00

param.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

parport.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

patch.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pci.h

[PATCH] Make sparc64 use setup-res.c

2005-09-08 14:57:25 -07:00

percpu.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

perfmon_default_smpl.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

perfmon.h

[IA64] alternate perfmon handler

2005-05-18 16:14:30 -07:00

pgalloc.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

pgtable.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

poll.h

[PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications

2006-03-25 08:22:56 -08:00

posix_types.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

processor.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ptrace_offsets.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ptrace.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

resource.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rse.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rwsem.h

[PATCH] add sem_is_read/write_locked()

2005-10-29 21:40:35 -07:00

sal.h

[IA64] avoid broken SAL_CACHE_FLUSH implementations

2006-02-02 13:25:54 -08:00

scatterlist.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sections.h

[PATCH] kprobes/ia64: refuse kprobe on ivt code

2005-06-27 15:23:54 -07:00

segment.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

semaphore.h

[IA64] Fix bug in ia64 specific down() function

2006-01-17 14:04:00 -08:00

sembuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

serial.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

setup.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

shmbuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

shmparam.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sigcontext.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

siginfo.h

[PATCH] consolidate SIGEV_PAD_SIZE

2005-05-01 08:59:08 -07:00

signal.h

[IA64] Delete MCA/INIT sigdelayed code

2006-01-26 13:23:27 -08:00

smp.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

socket.h

[NET]: Introduce SO_{SND,RCV}BUFFORCE socket options

2005-08-29 15:31:35 -07:00

sockios.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sparsemem.h

[PATCH] V5 ia64 SPARSEMEM - conditional changes for SPARSEMEM

2005-10-04 13:21:13 -07:00

spinlock_types.h

[PATCH] spinlock consolidation

2005-09-10 10:06:21 -07:00

spinlock.h

[PATCH] remove gcc-2 checks

2006-01-08 20:14:02 -08:00

stat.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

statfs.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

string.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

suspend.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

system.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

termbits.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

termios.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

thread_info.h

[IA64] enable dumps to capture second page of kernel stack

2006-04-27 14:31:16 -07:00

timex.h

[IA64] ia64: simplify and fix udelay()

2006-02-15 13:37:04 -08:00

tlb.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

tlbflush.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

topology.h

[IA64] Setup an IA64 specific reclaim distance

2006-04-21 10:57:40 -07:00

types.h

[PATCH] sab: consolidate kmem_bufctl_t

2005-09-05 00:05:48 -07:00

uaccess.h

[PATCH] ia64 basic __user annotations

2005-09-29 08:46:27 -07:00

ucontext.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

unaligned.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

uncached.h

[PATCH] ia64 uncached alloc

2005-06-21 18:46:18 -07:00

unistd.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-04-29 01:42:26 +01:00

unwind.h

[IA64] MCA/INIT: remove obsolete unwind code

2005-09-11 14:09:34 -07:00

user.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ustack.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

vga.h

[IA64] always map VGA framebuffer UC, even if it supports WB

2006-04-07 22:47:12 -07:00

xor.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00