From: David S. Miller <davem@davemloft.net>
Date: Tue, 8 Jul 2014 02:39:34 +0000 (-0700)
Subject: Merge branch 'net_ovs_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar... 
X-Git-Tag: v3.16-rc6~36^2~39
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=edc1bb0bd7d409f62ed7ba462ca5313be95cbed3;p=~emulex%2Finfiniband.git

Merge branch 'net_ovs_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch

Pravin B Shelar says:

====================
Open vSwitch

A set of fixes for net.
First bug is related flow-table management.  Second one is in sample
action. Third is related flow stats and last one add gre-err handler for ovs.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

edc1bb0bd7d409f62ed7ba462ca5313be95cbed3