diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-03-20 14:35:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-20 14:35:09 -0700 |
| commit | 0e24d34a5b95226cfc335817aefd9cf9744e5659 (patch) | |
| tree | 6d260dce843bd4b86debb778c6c7a0d9466369ef /include/net/xfrm.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 (diff) | |
| parent | vhost-net: remove unlocked use of receive_queue (diff) | |
| download | linux-dev-0e24d34a5b95226cfc335817aefd9cf9744e5659.tar.xz linux-dev-0e24d34a5b95226cfc335817aefd9cf9744e5659.zip | |
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'include/net/xfrm.h')
0 files changed, 0 insertions, 0 deletions