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)
commit556ef63255f1a6f82910a637c4164dbf7d3d1af2
treeae209fe4959e0837bf4eb72abc6e02c8a82179a1
parentd4f8f217b8a5d5bd02af979650418dca4caec472
parentcb655d0f3d57c23db51b981648e452988c0223f9
Merge commit 'v2.6.36-rc7' into core/rcu

Merge reason: Update from -rc3 to -rc7.

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