]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'signal/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:56:52 +0000 (12:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:56:52 +0000 (12:56 +1100)
commit2ff0de463c532dda84b5a982259f3da882a0c2fe
tree8515f90b5b9f1967a8330fa56db1f89dd1965d89
parent09693fb456b35e7f0bd7b48b677e884f1fb96ab2
parent12f79be93d94698778ff2b3f921073fc5f6780d6
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/arm/include/asm/thread_info.h
arch/c6x/Kconfig
arch/m68k/Kconfig
arch/mn10300/Kconfig
arch/powerpc/Kconfig
24 files changed:
arch/arm/include/asm/thread_info.h
arch/c6x/Kconfig
arch/c6x/include/uapi/asm/unistd.h
arch/frv/Kconfig
arch/frv/kernel/process.c
arch/ia64/kernel/signal.c
arch/m68k/Kconfig
arch/m68k/kernel/process.c
arch/microblaze/kernel/signal.c
arch/mn10300/Kconfig
arch/mn10300/kernel/process.c
arch/powerpc/Kconfig
arch/powerpc/include/asm/processor.h
arch/powerpc/include/asm/ptrace.h
arch/powerpc/include/asm/thread_info.h
arch/powerpc/include/asm/unistd.h
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kernel/process.c
arch/powerpc/kernel/sys_ppc32.c
arch/tile/kernel/compat_signal.c
arch/x86/kernel/entry_32.S
kernel/sched/core.c