projects / kernel / kernel-generic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fda76e0 8700c95)
Merge commit '8700c95adb03' into timers/nohz
authorFrederic Weisbecker <fweisbec@gmail.com>
Thu, 2 May 2013 15:37:49 +0000 (17:37 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Thu, 2 May 2013 15:54:19 +0000 (17:54 +0200)
commitc032862fba51a3ca504752d3a25186b324c5ce83
tree955dc2ba4ab3df76ecc2bb780ee84aca04967e8dtree | snapshot
parentfda76e074c7737fc57855dd17c762e50ed526052commit | diff
parent8700c95adb033843fc163d112b9d21d4fda78018commit | diff
Merge commit '8700c95adb03' into timers/nohz

The full dynticks tree needs the latest RCU and sched
upstream updates in order to fix some dependencies.

Merge a common upstream merge point that has these
updates.

Conflicts:
include/linux/perf_event.h
kernel/rcutree.h
kernel/rcutree_plugin.h

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
17 files changed:
Documentation/RCU/stallwarn.txt diff1 | diff2 | blob | history
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
include/linux/perf_event.h diff1 | diff2 | blob | history
include/linux/rcupdate.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
init/Kconfig diff1 | diff2 | blob | history
init/main.c diff1 | diff2 | blob | history
kernel/events/core.c diff1 | diff2 | blob | history
kernel/hrtimer.c 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/sched/core.c diff1 | diff2 | blob | history
kernel/sched/fair.c diff1 | diff2 | blob | history
kernel/sched/sched.h diff1 | diff2 | blob | history
kernel/softirq.c diff1 | diff2 | blob | history
kernel/time/tick-broadcast.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;