]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9938a6a17816b1bc290b3f1a8c05a0ff925c9976
treeae209fe4959e0837bf4eb72abc6e02c8a82179a1
parent26f95fd384cbb0b3ab02e8fbb80daf60be315da7
parent7329675ae084388731f0daa1ab79f8eff0953ed2
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