Merge branch 'dpdk_merge' of https://github.com/istokes/ovs into HEAD

author Ben Pfaff <blp@ovn.org>

Fri, 6 Jul 2018 20:53:13 +0000 (13:53 -0700)

committer Ben Pfaff <blp@ovn.org>

Fri, 6 Jul 2018 20:53:13 +0000 (13:53 -0700)
author Ben Pfaff <blp@ovn.org>
Fri, 6 Jul 2018 20:53:13 +0000 (13:53 -0700)
committer Ben Pfaff <blp@ovn.org>
Fri, 6 Jul 2018 20:53:13 +0000 (13:53 -0700)
diff --cc NEWS
Simple merge
diff --cc vswitchd/vswitch.xml
Simple merge
author	Ben Pfaff <blp@ovn.org>
	Fri, 6 Jul 2018 20:53:13 +0000 (13:53 -0700)
committer	Ben Pfaff <blp@ovn.org>
	Fri, 6 Jul 2018 20:53:13 +0000 (13:53 -0700)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
vswitchd/vswitch.xml	patch \|	diff1 \|	diff2 \|	blob \| history