Merge commit '9dc63482bbeae23dd57b0f885a3fd26b44656844'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 15 Aug 2013 17:35:59 +0000 (19:35 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 15 Aug 2013 17:35:59 +0000 (19:35 +0200)
1  2 
lib/netdev-provider.h
lib/netdev.c

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