From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Tue, 21 Jan 2014 15:37:36 +0000 (+0100)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-2.1.90-1~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1e827902be9194d71ea851c9ce2676f65eeed33a;hp=1e827902be9194d71ea851c9ce2676f65eeed33a;p=sliver-openvswitch.git

Merge branch 'mainstream'

Conflicts:
	Makefile.am
	lib/dpif-netdev.c
---