]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'signal/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:30:49 +0000 (16:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:30:49 +0000 (16:30 +1100)
commita0b2dea1fdcf896822842a21ef638cc0560f6783
treecb13d42bf67917e6a8cd433b68e5de566cdf1025
parent20b16ef2ecdf2fe3c7e40b9fec9ef9f44126b068
parent235b80226b986dabcbba844968f7807866bd0bfe
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/mips/kernel/linux32.c
arch/mips/kernel/process.c
arch/mips/kernel/scall64-o32.S
arch/mips/kernel/signal.c
arch/mips/kernel/signal32.c
arch/mips/kernel/signal_n32.c
arch/mips/kernel/syscall.c
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig
40 files changed:
arch/Kconfig
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/arm64/kernel/signal32.c
arch/frv/Kconfig
arch/m68k/include/asm/unistd.h
arch/microblaze/kernel/ptrace.c
arch/microblaze/kernel/signal.c
arch/mips/Kconfig
arch/mips/include/asm/compat.h
arch/mips/include/uapi/asm/signal.h
arch/mips/kernel/linux32.c
arch/mips/kernel/scall32-o32.S
arch/mips/kernel/scall64-64.S
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S
arch/mips/kernel/signal.c
arch/mips/kernel/signal32.c
arch/mips/kernel/signal_n32.c
arch/mips/kernel/syscall.c
arch/openrisc/kernel/entry.S
arch/parisc/kernel/entry.S
arch/parisc/kernel/signal.c
arch/powerpc/Kconfig
arch/powerpc/kernel/signal.c
arch/s390/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/tile/include/asm/syscalls.h
arch/x86/Kconfig
arch/x86/ia32/ia32entry.S
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
arch/x86/um/Kconfig
arch/xtensa/include/uapi/asm/unistd.h
include/asm-generic/unistd.h
include/linux/sched.h
kernel/futex_compat.c
kernel/signal.c