git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 20 Aug 2012 06:50:42 +0000 (16:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 20 Aug 2012 06:50:42 +0000 (16:50 +1000)
commit	cf1f6ba82e3c4e7c9f7ab8e0484b0f70ab1af3c6
tree	da57ab7b3d37f72a39c11900bfcc7d5e4a1fa2b3	tree \| snapshot
parent	7b39903e495b35a5659fc91d9acbf1c8f61d9a01	commit \| diff
parent	2e117f2dde025f5ca24f8cf97d7dcfbf88748b21	commit \| diff

Merge branch 'signal/from-sfr'

Conflicts:
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	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/avr32/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/frv/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/h8300/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/m32r/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall32-o32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-64.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-n32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
arch/mn10300/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/mn10300/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/cpu/sh5/entry.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vm86_32.c	diff1 \|	diff2 \|	blob \| history
arch/xtensa/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

arch/arm/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/avr32/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/frv/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/h8300/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/m32r/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall32-o32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-64.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-n32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
arch/mn10300/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/mn10300/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/cpu/sh5/entry.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vm86_32.c	diff1 \|	diff2 \|	blob \| history
arch/xtensa/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history