summaryrefslogtreecommitdiff
path: root/sock.h
diff options
context:
space:
mode:
Diffstat (limited to 'sock.h')
0 files changed, 0 insertions, 0 deletions
lt;davem@davemloft.net>2017-02-09 22:59:36 -0500 committerDavid S. Miller <davem@davemloft.net>2017-02-09 22:59:36 -0500 commita507c346b7fdc97296fa74626df49fdb7296a04e (patch) treee1a5001b3df43bc608a143fc16c6a7f2ff039807 /include/uapi parent9878f60240f786286ebfaa8ff9227ef38da1720c (diff)parent316d4d78cf9b6795b83f97c45368748741df418c (diff)
Merge branch 'openvswitch-Conntrack-integration-improvements'
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/openvswitch.h33
1 files changed, 30 insertions, 3 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h