From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 2 May 2013 15:37:49 +0000 (+0200)
Subject: Merge commit '8700c95adb03' into timers/nohz
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~34^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c032862fba51a3ca504752d3a25186b324c5ce83;p=pandora-kernel.git

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

c032862fba51a3ca504752d3a25186b324c5ce83
Reading git-diff-tree failed