]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'signal/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 03:00:13 +0000 (14:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 03:00:13 +0000 (14:00 +1100)
commitb9cd5641fb58cc5e5fd9f6bafefeab48ae3d5b65
tree33a4ceeddd964485a70903fd158ecbc6aa8eae56
parent2807fc270fbed4e99dcb1b8dab2200ca8e08d499
parent8a7d0dd003107f995ec60c91d452d9a7cafece8c
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/sparc/kernel/sys_sparc_64.c
arch/mips/Kconfig
arch/mips/kernel/mips_ksyms.c
arch/mips/kernel/scall64-n32.S
arch/powerpc/include/asm/unistd.h
arch/s390/kernel/entry64.S
arch/sparc/include/asm/processor_64.h
arch/sparc/include/asm/thread_info_64.h
arch/sparc/kernel/process_64.c
arch/sparc/kernel/sys_sparc_64.c
arch/sparc/kernel/systbls_64.S
include/linux/sched.h