]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Sep 2010 04:59:51 +0000 (21:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Sep 2010 04:59:51 +0000 (21:59 -0700)
1  2 
kernel/cgroup.c

diff --cc kernel/cgroup.c
Simple merge