Frederic Weisbecker c032862fba 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>

2013-05-02 17:54:19 +02:00

22 KiB

Raw Blame History

View Raw