Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 5 Nov 2013 08:56:15 +0000 (09:56 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 5 Nov 2013 08:56:15 +0000 (09:56 +0100)
commit5ea1eab089607de8f87189fe4463364e26576070
tree0d1331f38a307f8d184a98365a36bbf1a6e02a36
parent2431be1b68d386bd616378d2c528242775c4d54a
parentf0e7025f7e107f62e3c125a956cb0d608931f338
Merge branch 'mainstream'
lib/dpif-netdev.c
lib/dpif.c