Merge branch 'master' into forward-port

Conflicts:
	lib/automake.mk
	lib/dpif-netdev.c
	lib/netdev-provider.h
	lib/netdev.c

diff --cc Makefile.am
Simple merge

diff --cc lib/automake.mk
index 8180517,11e9738..8f081eb
--- 1/lib/automake.mk
--- 2/lib/automake.mk
+++ b/lib/automake.mk
@@@ -177,8 -168,8 +178,10 @@@ lib_libopenvswitch_a_SOURCES = 
        lib/timer.h \
        lib/timeval.c \
        lib/timeval.h \
 +      lib/token-bucket.c \
 +      lib/token-bucket.h \
+       lib/tunalloc.c \
+       lib/tunalloc.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \

diff --cc lib/dpif-netdev.c
Simple merge

diff --cc lib/dpif-provider.h
Simple merge

diff --cc lib/dpif.c
Simple merge

diff --cc lib/netdev-linux.c
Simple merge

diff --cc lib/netdev-provider.h
index 94f60af,9a3217e..f56a0ce
--- 1/lib/netdev-provider.h
--- 2/lib/netdev-provider.h
+++ b/lib/netdev-provider.h
@@@ -596,9 -593,9 +596,12 @@@ const struct netdev_class *netdev_looku
  extern const struct netdev_class netdev_linux_class;
  extern const struct netdev_class netdev_internal_class;
  extern const struct netdev_class netdev_tap_class;
 +#ifdef __FreeBSD__
 +extern const struct netdev_class netdev_bsd_class;
 +#endif
+ extern const struct netdev_class netdev_tap_pl_class;
+ 
+ extern const struct netdev_class netdev_tunnel_class;
  
  #ifdef  __cplusplus
  }

diff --cc lib/netdev.c
index 394d895,9445bdf..2b4dec4
--- 1/lib/netdev.c
--- 2/lib/netdev.c
+++ b/lib/netdev.c
@@@ -79,12 -78,10 +79,14 @@@ netdev_initialize(void
          netdev_register_provider(&netdev_linux_class);
          netdev_register_provider(&netdev_internal_class);
          netdev_register_provider(&netdev_tap_class);
+       netdev_register_provider(&netdev_tap_pl_class);
          netdev_vport_register();
 +#endif
 +#ifdef __FreeBSD__
 +        netdev_register_provider(&netdev_tap_class);
 +        netdev_register_provider(&netdev_bsd_class);
  #endif
+       netdev_register_provider(&netdev_tunnel_class);
      }
  }