Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 24 Jan 2013 10:05:16 +0000 (11:05 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 24 Jan 2013 10:05:16 +0000 (11:05 +0100)
commitd1673b006d53fdea72c0744e835362ed1917f879
tree265409f5b2d285c2b1795e8731105e999d68db5a
parent8b3ef15485bc8ff113621597ba220e3651b1538f
parentbceafb631807c36e388d12b5e18d05cd7cb1a3af
Merge branch 'mainstream'
Makefile.am
lib/automake.mk
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c
lib/netdev-provider.h
lib/netdev.c