]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'signal/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 05:25:50 +0000 (15:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 05:25:50 +0000 (15:25 +1000)
commit18637db4e07e7a9b0d951d1aa0a623c0aa51dc85
tree3e5f50f6009ea8118d56d69c933bf837d33e9e6c
parente208026e1226d44dd38cd7db3fc54d04bd121529
parent28fae2053a4fe15a17510c96d13627619472af25
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/signal.c
13 files changed:
arch/alpha/kernel/process.c
arch/arm/include/asm/thread_info.h
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/powerpc/include/asm/thread_info.h
arch/sparc/include/asm/Kbuild
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/signal.c
kernel/sched/core.c