system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-28 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/drivers/net/ethernet/intel/igb
History
David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-08 23:07:53 -04:00
..
e1000_82575.c igb: Add additional get_phy_id call for i354 devices 2013-09-12 16:24:55 -04:00
e1000_82575.h intel: Remove extern from function prototypes 2013-09-24 12:51:37 -07:00
e1000_defines.h igb: New PHY_ID for i354 device 2013-09-04 04:57:13 -07:00
e1000_hw.h intel: Remove extern from function prototypes 2013-09-24 12:51:37 -07: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 igb: Fix code comments and whitespace 2013-04-18 16:40:25 -07:00
e1000_mbx.h igb: Fix code comments and whitespace 2013-04-18 16:40:25 -07:00
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: M88E1543 PHY downshift implementation 2013-09-04 05:04:31 -07:00
e1000_phy.h igb: Support for SFP modules discovery 2013-05-21 02:37:36 -07:00
e1000_regs.h igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
igb.h igb: Add ethtool support to configure number of channels 2013-10-01 12:49:49 -04:00
igb_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-08 23:07:53 -04:00
igb_hwmon.c igb: Fix code comments and whitespace 2013-04-18 16:40:25 -07:00
igb_main.c net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
igb_ptp.c igb: Read register for latch_on without return value 2013-08-22 02:25:25 -07:00
Makefile igb: Copyright string update to year 2013 2013-01-19 05:05:05 -08:00