]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'signal/from-sfr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 06:34:00 +0000 (16:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 06:34:00 +0000 (16:34 +1000)
commit95a3c1db67ab88d6b927106cd80a8f7b3912edd2
treed0a9c680e4f7b70b40327a67cdd2d3af64d470b8
parenteaa4ae7c39072fbfcd79678a5a93879047ee15fe
parent2e117f2dde025f5ca24f8cf97d7dcfbf88748b21
Merge branch 'signal/from-sfr'

Conflicts:
arch/alpha/kernel/process.c
arch/arm/include/asm/thread_info.h
arch/powerpc/kernel/entry_64.S
arch/x86/kernel/signal.c
23 files changed:
arch/arm/include/asm/thread_info.h
arch/arm/kernel/signal.c
arch/avr32/kernel/signal.c
arch/frv/kernel/signal.c
arch/h8300/kernel/signal.c
arch/m32r/kernel/signal.c
arch/mips/include/asm/thread_info.h
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/mn10300/include/asm/thread_info.h
arch/mn10300/kernel/signal.c
arch/powerpc/include/asm/thread_info.h
arch/s390/include/asm/thread_info.h
arch/sh/kernel/cpu/sh5/entry.S
arch/x86/include/asm/thread_info.h
arch/x86/kernel/entry_32.S
arch/x86/kernel/process.c
arch/x86/kernel/signal.c
arch/x86/kernel/vm86_32.c
arch/xtensa/kernel/signal.c
kernel/sched/core.c