Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...
Ingo Molnar [Thu, 7 Oct 2010 07:43:11 +0000 (09:43 +0200)]
1  2 
Documentation/DocBook/kernel-locking.tmpl
drivers/vhost/vhost.c
include/linux/cgroup.h
kernel/cgroup.c
kernel/rcupdate.c
lib/radix-tree.c

Simple merge
Simple merge
diff --cc kernel/cgroup.c
Simple merge
Simple merge
Simple merge