Merge commit 'v2.6.36-rc7' into core/rcu
authorIngo Molnar <mingo@elte.hu>
Thu, 7 Oct 2010 07:43:38 +0000 (09:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 7 Oct 2010 07:43:45 +0000 (09:43 +0200)
Merge reason: Update from -rc3 to -rc7.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
drivers/vhost/net.c
drivers/vhost/vhost.c
include/linux/fs.h
include/net/cls_cgroup.h
net/netfilter/nf_conntrack_extend.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge