Merge commit 'v2.6.36-rc7' into core/rcu

Merge reason: Update from -rc3 to -rc7.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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

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

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

diff --cc include/net/cls_cgroup.h
Simple merge

diff --cc net/netfilter/nf_conntrack_extend.c
Simple merge