Merge remote-tracking branch 'rcu/rcu/next'

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/x86/kernel/kvmclock.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc include/linux/clocksource.h
Simple merge

diff --cc include/trace/events/rcu.h
Simple merge

diff --cc kernel/locking/lockdep.c
Simple merge

diff --cc kernel/time/clocksource.c
Simple merge

diff --cc kernel/time/timer.c
Simple merge

diff --cc mm/slab.h
Simple merge

diff --cc mm/slub.c
Simple merge