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
..
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
dp_notify.c
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
flow_table.c	net: replace remaining users of arch_fast_hash with jhash	2014-12-10 15:17:45 -05:00
flow_table.h
flow.c
flow.h
Kconfig	openvswitch: Fix build failure.	2014-11-14 01:24:27 -05:00
Makefile
vport-geneve.c
vport-gre.c	vlan: introduce *vlan_hwaccel_push_inside helpers	2014-11-21 14:20:17 -05:00
vport-internal_dev.c
vport-internal_dev.h
vport-netdev.c
vport-netdev.h
vport-vxlan.c
vport.c	openvswitch: set correct protocol on route lookup	2014-12-09 16:01:21 -05:00
vport.h