]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f09fda a3d7175)
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)
commit7a01ee674e7377748b7776daabe05020d9622f7d
treea45b440623a8fc55ece18b72e40829b2d9815d74tree | snapshot
parent0f09fdac868c0de62f3c83fde9096f03721c6922commit | diff
parenta3d7175cfc4dc109ebf2b5c4339a36a57cc5d369commit | 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.