Merge branch 'mainstream'

diff --cc Makefile.am
Simple merge

diff --cc lib/automake.mk
Simple merge

diff --cc lib/dpif-netdev.c
Simple merge

diff --cc lib/dpif-provider.h
Simple merge

diff --cc lib/dpif.c
Simple merge

diff --cc lib/netdev-provider.h
Simple merge

diff --cc lib/netdev.c
Simple merge