Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 14 Oct 2013 10:11:59 +0000 (12:11 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 14 Oct 2013 10:11:59 +0000 (12:11 +0200)
commit093f56c5c5c8b0891e837beb1defd84bc165ac6a
tree665f40ee8717e5039d3c1f63a2556fd4e4c0789d
parentf2c9a37733fa3d7a00a33bc78f88c7cece2bca68
parent690efec27ba170cf1bb5bbdd28e9d354c049829a
Merge branch 'mainstream'
lib/dpif-netdev.c
lib/dpif.c