Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Mon, 24 May 2010 17:01:14 +0000 (10:01 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 24 May 2010 17:01:14 +0000 (10:01 -0700)
commit333aa356f71fea05f125fe4310e82b5b690bb79a
treee91f5a5c915ad55eaef420a990d6e9dfd1ddc8de
parent02412ba200e141f3d7dfbe2cd26d7f51d5c5f4d1
parentd0a5f97842ef1598d07a6e3f10bab1543a38aa4d
Merge "master" into "wdp".
12 files changed:
datapath/Modules.mk
datapath/linux-2.6/Modules.mk
datapath/vport.c
datapath/vport.h
lib/automake.mk
lib/netdev-gre.c
lib/netdev-patch.c
lib/netdev-provider.h
lib/netdev-vport.c
lib/netdev.c
lib/vlog-modules.def
lib/xfif-linux.c