Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 4 May 2014 09:19:14 +0000 (11:19 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 4 May 2014 09:19:14 +0000 (11:19 +0200)
commit7d78f21c057ff50a823220d809ac38c3d907243c
tree1e44140d2cca901e304345e4a4d7a110a7aa197a
parent8d25251929c8f325bed0fff24192d5a87034b32e
parent04c881eb6441fff2e91c9b9e23502bc554c0f437
Merge branch 'mainstream'
Makefile.am
lib/automake.mk
lib/dpif-netdev.c
lib/dpif.c
lib/netdev-provider.h
lib/netdev.c