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>
	Fri, 21 Sep 2012 03:57:24 +0000 (13:57 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 21 Sep 2012 03:57:24 +0000 (13:57 +1000)
commit	4607da773f947334e94b1c7794e8351ac5fae52c
tree	858ff58dafdcd3397a0bc9cf2f62baf9e7aa1ff0	tree \| snapshot
parent	a103d4d256b150a5eedff01d252b531112828cf8	commit \| diff
parent	8f2bf660b8a34589ac7be168a654e05614224cff	commit \| diff

Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/sched/core.c

17 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/rcutree.c	diff1 \|	diff2 \|	blob \| history
kernel/rcutree.h	diff1 \|	diff2 \|	blob \| history
kernel/rcutree_plugin.h	diff1 \|	diff2 \|	blob \| history
kernel/rcutree_trace.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/rcutree.c	diff1 \|	diff2 \|	blob \| history
kernel/rcutree.h	diff1 \|	diff2 \|	blob \| history
kernel/rcutree_plugin.h	diff1 \|	diff2 \|	blob \| history
kernel/rcutree_trace.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history