]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'signal/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:45:41 +0000 (15:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:45:41 +0000 (15:45 +1000)
commit265968d8b3882afde4c2120323f4bb966db4239b
treef42da0127a0a6528c6b999ed0e4dac2aedd89ee8
parenta4b146ef4b7c9d88d5cb3f25ef235ae556d8d7c3
parent069349dce48dadcdf18f207927ebc7640b76c215
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/x86/kernel/process_32.c
arch/x86/kernel/signal.c
33 files changed:
arch/alpha/kernel/process.c
arch/arm/include/asm/thread_info.h
arch/arm/kernel/process.c
arch/cris/include/asm/Kbuild
arch/frv/kernel/process.c
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/m68k/kernel/process.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/powerpc/include/asm/thread_info.h
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/process.c
arch/s390/include/asm/processor.h
arch/s390/include/asm/unistd.h
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/entry64.S
arch/s390/kernel/process.c
arch/sparc/include/asm/Kbuild
arch/x86/ia32/sys_ia32.c
arch/x86/include/asm/sys_ia32.h
arch/x86/include/asm/thread_info.h
arch/x86/kernel/Makefile
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
arch/x86/kernel/process.c
arch/x86/kernel/process_32.c
arch/x86/kernel/signal.c
include/linux/ptrace.h
kernel/sched/core.c