Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6 ...

Fixes a merge conflict against the x86 tree caused by a fix to
atomic.h which I renamed to atomic_long.h.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2009-06-12 11:32:58 +02:00

..

atomic.h

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

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

auxvec.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

bitops.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

bitsperlong.h

asm-generic: introduce asm/bitsperlong.h

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

bug.h

MN10300: Stop gcc from generating uninitialised variable warnings after BUG()

2009-04-15 13:55:13 -07:00

bugs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

busctl-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

byteorder.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

cache.h

Separate out the proc- and unit-specific header directories from the general

2009-04-10 14:33:48 +01:00

cacheflush.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

checksum.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

cpu-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

cputime.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

current.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

delay.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

device.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

div64.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

dma-mapping.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

dma.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

dmactl-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

elf.h

MN10300: Add utrace/tracehooks support

2009-06-11 09:02:20 -07:00

emergency-restart.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

errno.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

exceptions.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

fb.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

fcntl.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

fpu.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

frame.inc

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

ftrace.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

futex.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

gdb-stub.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

hardirq.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

highmem.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

hw_irq.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

intctl-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

io.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

ioctl.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

ioctls.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

ipc.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

ipcbuf.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

irq_regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

irq.h

Separate out the proc- and unit-specific header directories from the general

2009-04-10 14:33:48 +01:00

Kbuild

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

kdebug.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

kmap_types.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

kprobes.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

linkage.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

local.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

mc146818rtc.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

mman.h

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

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

mmu_context.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

mmu.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

module.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

msgbuf.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

mutex.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

nmi.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

page_offset.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

page.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

param.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

pci.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

percpu.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

pgalloc.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

pgtable.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

pio-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

poll.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

posix_types.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

processor.h

MN10300: Add utrace/tracehooks support

2009-06-11 09:02:20 -07:00

ptrace.h

MN10300: Add utrace/tracehooks support

2009-06-11 09:02:20 -07:00

reset-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

resource.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

rtc-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

rtc.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

scatterlist.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

sections.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

sembuf.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

serial-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

serial.h

Separate out the proc- and unit-specific header directories from the general

2009-04-10 14:33:48 +01:00

setup.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

shmbuf.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

shmparam.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

sigcontext.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

siginfo.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

signal.h

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

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

smp.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

socket.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

sockios.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

spinlock.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

stat.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

statfs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

string.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

swab.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

system.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

termbits.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

termios.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

thread_info.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

timer-regs.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

timex.h

Separate out the proc- and unit-specific header directories from the general

2009-04-10 14:33:48 +01:00

tlb.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

tlbflush.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

topology.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

types.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

uaccess.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

ucontext.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

unaligned.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

unistd.h

MN10300: Wire up missing system calls

2009-04-15 13:55:13 -07:00

user.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

vga.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00

xor.h

Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.

2009-04-10 14:19:03 +01:00