David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
e1000_82575.c	igb: Add new feature Media Auto Sense for 82580 devices only	2013-12-10 01:27:35 -08:00
e1000_82575.h	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
e1000_defines.h	igb: Add new feature Media Auto Sense for 82580 devices only	2013-12-10 01:27:35 -08:00
e1000_hw.h	igb: Add new feature Media Auto Sense for 82580 devices only	2013-12-10 01:27:35 -08:00
e1000_i210.c	igb: Refactor NVM read functions to accommodate devices with no flash	2013-08-22 02:26:00 -07:00
e1000_i210.h	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
e1000_mac.c	igb: Read flow control for i350 from correct EEPROM section	2013-09-12 16:24:55 -04:00
e1000_mac.h	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
e1000_mbx.c
e1000_mbx.h
e1000_nvm.c	igb: Fix get_fw_version function for all parts	2013-08-22 02:26:09 -07:00
e1000_nvm.h	igb: Fix get_fw_version function for all parts	2013-08-22 02:26:09 -07:00
e1000_phy.c	igb: Fix for issue where values could be too high for udelay function.	2013-12-14 22:59:42 -05:00
e1000_phy.h
e1000_regs.h
igb_ethtool.c	igb: Change to use statically allocated array for MSIx entries	2013-12-17 22:43:14 -08:00
igb_hwmon.c	igb: Start temperature sensor attribute index with 1	2013-12-10 01:27:35 -08:00
igb_main.c	igb: Change to use statically allocated array for MSIx entries	2013-12-17 22:43:14 -08:00
igb_ptp.c	igb: Read register for latch_on without return value	2013-08-22 02:25:25 -07:00
igb.h	igb: Change to use statically allocated array for MSIx entries	2013-12-17 22:43:14 -08:00
Makefile