projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bda4ec9 bff4a39)
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)
commit5217192b85480353aeeb395574e60d0db04f3676
treea45b440623a8fc55ece18b72e40829b2d9815d74tree | snapshot
parentbda4ec9f6a7d7b249c7b14baa553731efedce300commit | diff
parentbff4a394795add6b919debc009f72b7607f5d4bfcommit | 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
John Crispins staging tree