David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
i40e_adminq.c	i40e/i40evf: avoid mutex re-init	2015-12-03 13:43:06 -08:00
i40e_adminq.h	i40e/i40evf: fix a potential type compare issue	2015-10-07 13:38:11 -07:00
i40e_adminq_cmd.h	i40e: Opcode and structures required by OEM Post Update AQ command and add new NVM arq message	2015-12-12 21:08:31 -08:00
i40e_alloc.h
i40e_common.c	i40e: re-use %*ph specifier to hexdump a data	2015-10-23 05:22:13 -07:00
i40e_devids.h	i40e/i40evf: split device ids into a separate file	2015-10-13 23:37:13 -07:00
i40e_hmc.h	i40e: use BIT and BIT_ULL macros	2015-07-23 05:33:55 -07:00
i40e_lan_hmc.h
i40e_osdep.h	move io-64-nonatomic*.h out of asm-generic	2015-10-15 00:21:07 +02:00
i40e_prototype.h	i40e/i40evf: Add a workaround to drop all flow control frames	2015-10-23 04:17:55 -07:00
i40e_register.h	i40evf: Remove PF specific register definitions from the VF	2015-08-26 15:05:17 -07:00
i40e_status.h
i40e_txrx.c	i40e: trivial fixes	2015-12-03 02:23:39 -08:00
i40e_txrx.h	i40e: Detection and recovery of TX queue hung logic moved to service_task from tx_timeout	2015-12-03 02:23:31 -08:00
i40e_type.h	i40e/i40evf: Fix an accidental error with BIT_ULL replacement	2015-10-19 15:35:45 -07:00
i40e_virtchnl.h	i40e/i40evf: Add a new offload for RSS PCTYPE V2 for X722	2015-12-12 21:08:42 -08:00
i40evf.h	i40evf: increase max number of queues	2015-12-03 02:23:28 -08:00
i40evf_ethtool.c	i40evf: allocate ring structs dynamically	2015-12-01 22:56:30 -08:00
i40evf_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
i40evf_virtchnl.c	i40e/i40evf: Add a new offload for RSS PCTYPE V2 for X722	2015-12-12 21:08:42 -08:00
Makefile