From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Thu, 15 Aug 2013 18:43:14 +0000 (+0200)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-2.0.90-1~27
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=fa04edcedfe5285fd8ad3a4d70fecb38df18293d

Merge branch 'mainstream'

Conflicts:
	lib/netdev.c
---

fa04edcedfe5285fd8ad3a4d70fecb38df18293d
diff --cc lib/netdev.c
index 5f4345aff,088aea907..c70105ba0
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@@ -89,8 -109,8 +109,10 @@@ netdev_initialize(void
          netdev_register_provider(&netdev_tap_class);
          netdev_register_provider(&netdev_bsd_class);
  #endif
- 	netdev_register_provider(&netdev_tunnel_class);
- 	netdev_register_provider(&netdev_pltap_class);
++        netdev_register_provider(&netdev_tunnel_class);
++        netdev_register_provider(&netdev_pltap_class);
+ 
+         ovsthread_once_done(&once);
      }
  }