Merge commit 'b5d57fc87925cb3c029de19d0a94de5ca07ae28e'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 16:06:37 +0000 (18:06 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 16:06:37 +0000 (18:06 +0200)
1  2 
lib/netdev-provider.h
lib/netdev.c

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