Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)
commit7a97619ae4484604c15b846ce7268094e048729a
tree5ac75ab3b14ece2a4921cefd38c6422a42bfc4df
parentb3dffe576c4cbbfe2367c2f566ace140b330801d
parent41fc9c180f79d405bdaaf3eaf1664bbc524dcf24
Merge branch 'mainstream'
Makefile.am
lib/automake.mk
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c
lib/netdev.c