Justin Pettit a4af00400a Merge branch 'master' into next ...

Conflicts:
	COPYING
	datapath/datapath.h
	lib/automake.mk
	lib/dpif-provider.h
	lib/dpif.c
	lib/hmap.h
	lib/netdev-provider.h
	lib/netdev.c
	lib/stream-ssl.h
	ofproto/executer.c
	ofproto/ofproto.c
	ofproto/ofproto.h
	tests/automake.mk
	utilities/ovs-ofctl.c
	utilities/ovs-vsctl.in
	vswitchd/ovs-vswitchd.conf.5.in
	xenserver/etc_init.d_vswitch
	xenserver/etc_xensource_scripts_vif
	xenserver/opt_xensource_libexec_interface-reconfigure

2010-02-05 17:14:55 -08:00

..

automake.mk

gre: Add kernel GRE support.

2009-12-07 12:48:03 -08:00

brcompat-netlink.h

brcompat: Move BRCTL_GET_BRIDGES, BRCTL_GET_PORT_LIST into userspace.

2009-08-07 15:11:40 -07:00

datapath-protocol.h

sflow: Fix sFlow sampling structure.

2010-01-20 14:33:28 -08:00

gre.h

gre: Add kernel GRE support.

2009-12-07 12:48:03 -08:00