From: Ingo Molnar Date: Thu, 13 Sep 2012 15:18:38 +0000 (+0200) Subject: Merge branch 'core/rcu' into perf/core X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4553f0b90e1fd93b95a97918804528d4039201fc;p=linux-beck.git Merge branch 'core/rcu' into perf/core Steve Rostedt asked for the merge of a single commit, into both the RCU and the perf/tracing tree: | Josh made a change to the tracing code that affects both the | work Paul McKenney and I are currently doing. At the last | Kernel Summit back in August, Linus said when such a case | exists, it is best to make a separate branch based off of his | tree and place the change there. This way, the repositories | that need to share the change can both pull them in and the | SHA1 will match for both. Whichever branch is pulled in first | by Linus will also pull in the necessary change for the other | branch as well. Signed-off-by: Ingo Molnar --- 4553f0b90e1fd93b95a97918804528d4039201fc