projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f6c018 a8d3782)
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
1  2 
drivers/vhost/net.c patch | diff1 | diff2 | blob | history
drivers/vhost/vhost.c patch | diff1 | diff2 | blob | history

diff --cc drivers/vhost/net.c
Simple merge
diff --cc drivers/vhost/vhost.c
Simple merge