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

..

iseries

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

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

8253pit.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

a.out.h

[PATCH] powerpc: Merge include/asm-ppc*/a.out.h into include/asm-powerpc

2005-09-21 19:21:08 +10:00

abs_addr.h

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

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

agp.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

asm-compat.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

atomic.h

[PATCH] powerpc: native atomic_add_unless

2006-02-24 14:06:02 +11:00

auxvec.h

[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel

2005-11-11 22:25:39 +11:00

backlight.h

powerpc: Merged asm/backlight.h

2005-10-11 09:59:38 +10:00

bitops.h

[PATCH] bitops: powerpc: use generic bitops

2006-03-26 08:57:14 -08:00

bootx.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

btext.h

[PATCH] powerpc: Unify udbg (#2)

2006-01-09 14:49:54 +11:00

bug.h

[PATCH] git-powerpc: WARN was a dumb idea

2006-03-28 20:48:54 +11:00

bugs.h

[PATCH] powerpc: Make check_bugs() static inline

2005-09-09 22:11:35 +10:00

byteorder.h

[PATCH] powerpc: merge byteorder.h

2005-09-28 15:42:53 +10:00

cache.h

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

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

cacheflush.h

[PATCH] powerpc: Merge cacheflush.h and cache.h

2005-11-10 13:09:22 +11:00

checksum.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

compat.h

[PATCH] powerpc signal __user annotations

2006-02-08 01:03:46 -05:00

cputable.h

[PATCH] powerpc: Add cputable entry for POWER6

2006-04-29 10:56:58 +10:00

cputime.h

powerpc: Implement accurate task and CPU time accounting

2006-02-24 14:05:56 +11:00

current.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

dbdma.h

powerpc: Merge various powermac-related header files.

2005-10-20 20:53:39 +10:00

delay.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

div64.h

[PATCH] Move the identical files from include/asm-ppc{,64}

2005-08-30 13:32:05 +10: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

eeh_event.h

[PATCH] powerpc: PCI Error Recovery: PPC64 core recovery routines

2006-01-10 15:28:32 +11:00

eeh.h

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

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

elf.h

Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.

2006-05-04 12:39:12 +01:00

emergency-restart.h

[PATCH] Move the identical files from include/asm-ppc{,64}

2005-08-30 13:32:05 +10:00

errno.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

fcntl.h

[PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc

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

firmware.h

[PATCH] powerpc: Rename and export ppc64_firmware_features

2006-03-28 16:45:20 +11:00

floppy.h

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

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

futex.h

[PATCH] lightweight robust futexes updates

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

grackle.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

hardirq.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

heathrow.h

powerpc: Fix some #ifndef __KERNEL__ that should be #ifdef

2006-01-09 15:14:05 +11:00

hvcall.h

[PATCH] powerpc: Extends HCALL interface for InfiniBand usage

2006-04-01 22:37:00 +11:00

hvconsole.h

[PATCH] powerpc: hvc_console updates

2006-03-28 16:45:26 +11:00

hvcserver.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

hw_irq.h

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

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

i8259.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

ibmebus.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

ide.h

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

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

io.h

[PATCH] powerpc: Use check_legacy_ioport() on ppc32 too.

2006-04-28 21:04:55 +10:00

ioctl.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

ioctls.h

powerpc: remove duplicate ioctl definitions

2005-11-01 14:36:30 +11:00

iommu.h

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

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

ipc.h

[PATCH] Move the identical files from include/asm-ppc{,64}

2005-08-30 13:32:05 +10:00

ipcbuf.h

[PATCH] powerpc: Keep fixing merged ipcbuf.h

2005-11-03 16:58:17 +11:00

ipic.h

[PATCH] powerpc: moved ipic code to arch/powerpc

2006-01-09 14:48:57 +11:00

irq.h

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

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

kdebug.h

[PATCH] Notifier chain update: API changes

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

kdump.h

[PATCH] powerpc: Reroute interrupts from 0 + offset to PHYSICAL_START + offset

2006-01-09 14:52:21 +11:00

kexec.h

[PATCH] fix kexec asm

2006-03-08 14:15:04 -08:00

keylargo.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

kmap_types.h

[PATCH] powerpc: Merge kmap_types.h

2005-09-19 09:38:49 +10:00

kprobes.h

[PATCH] kprobes: fix build breakage

2006-01-10 08:01:40 -08:00

linkage.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

lmb.h

[PATCH] powerpc: Remove calculation of io hole

2006-03-22 15:04:30 +11:00

local.h

[PATCH] Move all the very similar files to asm-powerpc

2005-08-30 13:32:06 +10:00

lppaca.h

[PATCH] Fix sparse parse error in lppaca.h

2006-01-17 17:18:25 -08:00

machdep.h

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

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

macio.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

mc146818rtc.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

mediabay.h

powerpc: Merge various powermac-related header files.

2005-10-20 20:53:39 +10:00

mman.h

[PATCH] add asm-generic/mman.h

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

mmu_context.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

mmu.h

[PATCH] powerpc: Remove calculation of io hole

2006-03-22 15:04:30 +11:00

mmzone.h

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

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

module.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

mpic.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

msgbuf.h

[PATCH] powerpc: Merge a few more include files

2005-09-09 22:11:35 +10:00

mutex.h

[PATCH] mutex subsystem, add default include/asm-*/mutex.h files

2006-01-09 15:59:19 -08:00

namei.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

nvram.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

of_device.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

ohare.h

powerpc: Fix some #ifndef __KERNEL__ that should be #ifdef

2006-01-09 15:14:05 +11:00

oprofile_impl.h

[PATCH] powerpc: Remove oprofile spinlock backtrace code

2006-03-29 13:44:16 +11:00

paca.h

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

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

page_32.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

page_64.h

[PATCH] powerpc: Fix pagetable bloat for hugepages

2006-04-28 15:02:51 +10:00

page.h

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

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

param.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

parport.h

[PATCH] powerpc: parallel port init fix

2006-01-11 14:49:24 +11:00

pci-bridge.h

[PATCH] powerpc: small pci cleanups

2006-01-12 20:09:30 +11:00

pci.h

[PATCH] powerpc: make pcibios_claim_one_bus available to other code

2006-01-09 14:51:08 +11:00

percpu.h

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

pgalloc.h

[PATCH] powerpc: Fix pagetable bloat for hugepages

2006-04-28 15:02:51 +10:00

pgtable-4k.h

Merge ../linux-2.6

2006-03-09 14:32:05 +11:00

pgtable-64k.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

pgtable.h

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

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

pmac_feature.h

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

pmac_low_i2c.h

[PATCH] 3/5 powerpc: Add platform functions interpreter

2006-01-09 15:47:18 +11:00

pmac_pfunc.h

[PATCH] powerpc: enable irq's for platform functions.

2006-02-01 08:53:10 -08:00

pmc.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

poll.h

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

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

posix_types.h

[PATCH] powerpc: Merge asm-ppc*/posix_types.h

2005-09-21 19:21:07 +10:00

ppc_asm.h

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

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

ppc-pci.h

[PATCH] powerpc: properly configure DDR/P5IOC children devs

2006-03-16 16:55:07 +11:00

processor.h

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

prom.h

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

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

pSeries_reconfig.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

ptrace.h

[PATCH] syscall entry/exit revamp

2006-01-09 14:49:01 +11:00

reg_8xx.h

[PATCH] powerpc: Merge cacheflush.h and cache.h

2005-11-10 13:09:22 +11:00

reg.h

powerpc: Unify the 32 and 64 bit idle loops

2006-03-27 15:03:03 +11:00

resource.h

[PATCH] Move all the very similar files to asm-powerpc

2005-08-30 13:32:06 +10:00

rtas.h

[PATCH] powerpc: Make early debugging configurable via Kconfig

2006-01-11 14:48:26 +11:00

rtc.h

powerpc: Make set_rtc_time() return error code from lower-level function

2005-10-22 15:57:55 +10:00

rwsem.h

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

scatterlist.h

[PATCH] powerpc: merge scatterlist.h

2005-10-27 16:45:52 +10:00

seccomp.h

powerpc: Fix some #ifndef __KERNEL__ that should be #ifdef

2006-01-09 15:14:05 +11:00

sections.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

semaphore.h

Merge ../linux-2.6 by hand

2005-10-31 13:37:12 +11:00

sembuf.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

serial.h

powerpc: Introduce a new config symbol to control 16550 early debug code

2006-01-10 16:19:05 +11:00

setup.h

[PATCH] powerpc: Merge a few more include files

2005-09-09 22:11:35 +10:00

shmbuf.h

[PATCH] powerpc: Fix __power64__ typos that should be __powerpc64__

2005-09-09 22:11:35 +10:00

shmparam.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

sigcontext.h

powerpc: merge sigcontext.h

2005-11-03 16:24:25 +11:00

siginfo.h

[PATCH] ppc64: Add definitions for new PTRACE calls

2005-09-12 17:19:12 +10:00

signal.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

smp.h

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

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

smu.h

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

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

socket.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

sockios.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

sparsemem.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

spinlock_types.h

[PATCH] powerpc: merge include/asm-ppc*/spinlock_types.h into include/asm-powerpc/spinlock_types.h

2005-09-21 19:21:09 +10:00

spinlock.h

[PATCH] powerpc: use lwsync in atomics, bitops, lock functions

2006-01-13 21:18:50 +11:00

spu_csa.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

spu.h

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

2006-05-06 19:59:18 +01:00

sstep.h

powerpc: Make single-stepping emulation (mostly) usable on 32-bit

2005-10-28 22:48:08 +10:00

stat.h

powerpc: merge stat.h

2005-11-03 16:02:23 +11:00

statfs.h

[PATCH] powerpc: merge include/asm-ppc*/statfs.h into include/asm-powerpc/statfs.h

2005-09-21 19:21:10 +10:00

string.h

powerpc: fix strncasecmp prototype

2006-03-25 09:41:40 -08:00

synch.h

[PATCH] powerpc: newline for ISYNC_ON_SMP

2006-02-24 14:06:00 +11:00

syscalls.h

[PATCH] powerpc: declare arch syscalls in <asm/syscalls.h>

2006-03-27 14:48:22 +11:00

system.h

[NET]: Allow skb headroom to be overridden

2006-03-31 02:27:06 -08:00

tce.h

[PATCH] powerpc: sanitize header files for user space includes

2006-01-09 15:13:08 +11:00

termbits.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

termios.h

powerpc: use asm-generic/termios.h

2005-11-01 14:36:55 +11:00

thread_info.h

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

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

time.h

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

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

timex.h

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

2006-04-26 12:56:16 +01: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

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

2006-05-06 19:59:18 +01:00

types.h

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

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

uaccess.h

powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses

2006-05-03 23:06:46 +10:00

ucontext.h

powerpc: merge ucontext.h

2005-11-03 16:59:17 +11:00

udbg.h

[PATCH] powerpc: Make early debugging configurable via Kconfig

2006-01-11 14:48:26 +11:00

unaligned.h

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

2005-09-09 22:11:34 +10:00

uninorth.h

powerpc: Merge various powermac-related header files.

2005-10-20 20:53:39 +10:00

unistd.h

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

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

user.h

[PATCH] powerpc: Merge a few more include files

2005-09-09 22:11:35 +10:00

vdso_datapage.h

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

vdso.h

[PATCH] powerpc: Make the vDSO functions set error code (#2)

2005-11-16 14:05:11 +11:00

vga.h

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

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

vio.h

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

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

xmon.h

powerpc: Simplify and clean up the xmon terminal I/O

2005-11-08 22:55:08 +11:00

xor.h

[PATCH] Move the identical files from include/asm-ppc{,64}

2005-08-30 13:32:05 +10:00