David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
i40e_adminq.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07: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/i40evf: Add new link status defines	2015-10-13 23:15:35 -07:00
i40e_alloc.h
i40e_common.c	i40e/i40evf: Fix compile issue related to const string	2015-10-16 04:38:35 -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
i40e_prototype.h	i40e/i40evf: Fix compile issue related to const string	2015-10-16 04:38:35 -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	drivers/net/intel: use napi_complete_done()	2015-10-16 04:33:46 -07:00
i40e_txrx.h	i40e/i40evf: moderate interrupts differently	2015-10-16 04:50:38 -07:00
i40e_type.h	i40e/i40evf: Refactor PHY structure and add phy_capabilities enum	2015-10-13 23:42:01 -07:00
i40e_virtchnl.h	i40e/i40evf: Add WB_ON_ITR offload support	2015-10-15 02:03:29 -07:00
i40evf.h	i40evf: relax and stagger init timing a bit	2015-10-16 05:00:17 -07:00
i40evf_ethtool.c	i40e: use BIT and BIT_ULL macros	2015-07-23 05:33:55 -07:00
i40evf_main.c	i40e/i40evf: Bump i40e to 1.3.34 and i40evf to 1.3.21	2015-10-16 05:05:08 -07:00
i40evf_virtchnl.c	i40e/i40evf: Add WB_ON_ITR offload support	2015-10-15 02:03:29 -07:00
Makefile