]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'signal/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:51:14 +0000 (14:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:51:14 +0000 (14:51 +1100)
commitd72cb24903cbc28fb2a487234c81a22405e8a446
treeabd67a08db46ab68a5eccf4deb97aca81208e298
parentfc0a87417d70994aba5704fb785002d672e478d7
parentd8e1d84d28ef6d740cc64e495a5c3dd96256afb4
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