Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 21 Jan 2014 15:37:36 +0000 (16:37 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 21 Jan 2014 15:37:36 +0000 (16:37 +0100)
commit1e827902be9194d71ea851c9ce2676f65eeed33a
treeaacbad530f62a92a5b491ca187d408948157659b
parent6b4b2f598246e87237342a9179a0d29e202ebe65
parent4ca828d713451307fea449be5111272f47c0c5a7
Merge branch 'mainstream'

Conflicts:
Makefile.am
lib/dpif-netdev.c
.gitignore
Makefile.am
lib/automake.mk
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c
lib/netdev-pltap.c
lib/netdev-provider.h
lib/netdev-tunnel.c
lib/netdev.c
sliver-openvswitch.spec