From: Paul E. McKenney Date: Tue, 25 Sep 2012 17:03:56 +0000 (-0700) Subject: Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~101^2~1^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593d1006cdf710ab3469c0c37c184fea0bc3da97;p=pandora-kernel.git Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b Resolved conflict in kernel/sched/core.c using Peter Zijlstra's approach from https://lkml.org/lkml/2012/9/5/585. --- 593d1006cdf710ab3469c0c37c184fea0bc3da97 Reading git-diff-tree failed