From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Tue, 25 Sep 2012 17:01:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~101^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5217192b85480353aeeb395574e60d0db04f3676;p=pandora-kernel.git

Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b

The conflicts between kernel/rcutree.h and kernel/rcutree_plugin.h
were due to adjacent insertions and deletions, which were resolved
by simply accepting the changes on both branches.
---

5217192b85480353aeeb395574e60d0db04f3676
Reading git-diff-tree failed