xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
eb1c2abb611b51a935cdb36bbc0e364958ccb83c
android_kernel_xiaomi_sm8450/kernel/rcutree_trace.c
Paul E. McKenney 5217192b85 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.
2012-09-25 10:01:45 -07:00

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink