Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

Jesse Gross says:

====================
[GIT net-next] Open vSwitch

Open vSwitch changes for net-next/3.14. Highlights are:
 * Performance improvements in the mechanism to get packets to userspace
   using memory mapped netlink and skb zero copy where appropriate.
 * Per-cpu flow stats in situations where flows are likely to be shared
   across CPUs. Standard flow stats are used in other situations to save
   memory and allocation time.
 * A handful of code cleanups and rationalization.
====================

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

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue_core.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/netlink/genetlink.c
Simple merge

diff --cc net/openvswitch/flow_table.c
Simple merge

diff --cc net/openvswitch/vport.c
Simple merge

diff --cc net/openvswitch/vport.h
Simple merge