]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e32f5d abe8e7f)
Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 25 Sep 2012 17:01:45 +0000 (10:01 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 25 Sep 2012 17:01:45 +0000 (10:01 -0700)
commitc7bc3adea026d34f05c35ea3a5536afe440de85b
treea45b440623a8fc55ece18b72e40829b2d9815d74tree | snapshot
parent3e32f5d9d84348f989241bbd5f50df2b3edc1ad6commit | diff
parentabe8e7f24cc6dd9d7abd8aba01e291da4fe98008commit | diff
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.
kernel/rcutree.c diff1 | diff2 | blob | history
kernel/rcutree.h diff1 | diff2 | blob | history
kernel/rcutree_plugin.h diff1 | diff2 | blob | history
kernel/rcutree_trace.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.