OSDN Git Service

Merge branch 'net_ovs_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar...
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2014 02:39:34 +0000 (19:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2014 02:39:34 +0000 (19:39 -0700)
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>

Trivial merge