Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)
commit69fc54f47bbc35e81bfe2e38e57f5dcfd9858df4
treec2beabf82dc7f2d04ed820cf7c1bce513b9ddab0
parent6b900de4efd368be88ef3db88b1eff8f835a7cf7
parent1dd16b9a274afbde46c9d9a4052d720d4cf3c3e2
Merge branch 'mainstream'
lib/automake.mk
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c
lib/netdev.c