Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvs...
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 May 2014 18:45:18 +0000 (14:45 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 May 2014 18:45:18 +0000 (14:45 -0400)
Pravin B Shelar says:

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

A set of OVS changes for net-next/3.16.

Most of change are related to improving performance of flow setup by
minimizing critical sections.
====================

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

Trivial merge