git.onelab.eu Git - sliver-openvswitch.git/commit

git://git.onelab.eu / sliver-openvswitch.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9575eae ba5c210)

author	Ben Pfaff <blp@nicira.com>
	Mon, 7 Jun 2010 17:23:16 +0000 (10:23 -0700)
committer	Ben Pfaff <blp@nicira.com>
	Mon, 7 Jun 2010 17:23:16 +0000 (10:23 -0700)
commit	b9e6283c97464acb188818db8f453d2edaef037e
tree	c100700dc0c49485dc5fae4191d93b3a5af5b3fb	tree \| snapshot
parent	9575eae3724fb437b2df9bfad02501325d3dcdaf	commit \| diff
parent	ba5c210e41cfc0b23abdc525634470137be65000	commit \| diff

Merge "master" branch into "wdp".

datapath/vport-netdev.c	diff1 \|	diff2 \|	blob \| history
lib/netdev.c	diff1 \|	diff2 \|	blob \| history
lib/netdev.h	diff1 \|	diff2 \|	blob \| history
lib/xfif-netdev.c	\|	diff2 \|	blob \| history
ofproto/wdp-xflow.c	\|	diff2 \|	blob \| history
utilities/ovs-openflowd.c	diff1 \|	diff2 \|	blob \| history
vswitchd/bridge.c	diff1 \|	diff2 \|	blob \| history

sliver-openvswitch