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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f01c81c 2e117f2)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 02:46:27 +0000 (12:46 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 02:46:27 +0000 (12:46 +1000)
commit	7e0e09ab6678ceca54bc13baac0683d7ca8ee9cf
tree	c12bda2acaa4d3f4025159c9d4c068a5d62d68f7	tree \| snapshot
parent	f01c81c03710b63af330f79687d2fd4ad429fa0a	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

18 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/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/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