Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

diff --cc Documentation/DocBook/kernel-locking.tmpl
Simple merge

diff --cc drivers/vhost/vhost.c
Simple merge

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

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/rcupdate.c
Simple merge

diff --cc lib/radix-tree.c
Simple merge