tree 955dc2ba4ab3df76ecc2bb780ee84aca04967e8d
parent fda76e074c7737fc57855dd17c762e50ed526052
parent 8700c95adb033843fc163d112b9d21d4fda78018
author Frederic Weisbecker <fweisbec@gmail.com> 1367509069 +0200
committer Frederic Weisbecker <fweisbec@gmail.com> 1367510059 +0200

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>