]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9cedbb 615cc22)
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 patch | diff1 | diff2 | blob | history

diff --cc kernel/cgroup.c
Simple merge
Linux kernel for KaRo TX COM modules