David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
Kconfig	openvswitch: Fix build failure.	2014-11-14 01:24:27 -05:00
Makefile	ovs: Turn vports with dependencies into separate modules	2014-10-28 14:43:18 -04:00
actions.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
datapath.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
datapath.h	openvswitch: Add support for OVS_FLOW_ATTR_PROBE.	2014-11-09 18:58:44 -08:00
dp_notify.c	genetlink: make multicast groups const, prevent abuse	2013-11-19 16:39:06 -05:00
flow.c	openvswitch: Add support for OVS_FLOW_ATTR_PROBE.	2014-11-09 18:58:44 -08:00
flow.h	openvswitch: Add support for OVS_FLOW_ATTR_PROBE.	2014-11-09 18:58:44 -08:00
flow_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
flow_netlink.h	openvswitch: Add support for OVS_FLOW_ATTR_PROBE.	2014-11-09 18:58:44 -08:00
flow_table.c	net: replace remaining users of arch_fast_hash with jhash	2014-12-10 15:17:45 -05:00
flow_table.h	openvswitch: Constify various function arguments	2014-11-09 18:58:44 -08:00
vport-geneve.c	openvswitch: Constify various function arguments	2014-11-09 18:58:44 -08:00
vport-gre.c	vlan: introduce *vlan_hwaccel_push_inside helpers	2014-11-21 14:20:17 -05:00
vport-internal_dev.c	openvswitch: Drop packets when interdev is not up	2014-11-05 23:52:35 -08:00
vport-internal_dev.h	openvswitch: introduce rtnl ops stub	2014-07-01 14:40:17 -07:00
vport-netdev.c	openvswitch: Constify various function arguments	2014-11-09 18:58:44 -08:00
vport-netdev.h	ovs: Turn vports with dependencies into separate modules	2014-10-28 14:43:18 -04:00
vport-vxlan.c	openvswitch: Extend packet attribute for egress tunnel info	2014-11-09 18:58:44 -08:00
vport.c	openvswitch: set correct protocol on route lookup	2014-12-09 16:01:21 -05:00
vport.h	openvswitch: Constify various function arguments	2014-11-09 18:58:44 -08:00