leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e486463e82
linux/drivers/net/ethernet/intel/igb
History
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -07:00
..
e1000_82575.c igb: Fix incorrect RAR address entries for i210/i211 device. 2012-06-20 00:50:54 -07:00
e1000_82575.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_defines.h igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC. 2012-05-17 05:04:21 -07:00
e1000_hw.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_i210.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_i210.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_mac.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_mac.h igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_mbx.c igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_mbx.h igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_nvm.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_nvm.h igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_phy.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_phy.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_regs.h igb: A fix to VF TX rate limit 2012-06-20 01:11:32 -07:00
igb_ethtool.c igb: Update firmware info output 2012-06-20 01:36:23 -07:00
igb_main.c igb: Version bump 2012-06-20 01:36:23 -07:00
igb_ptp.c igb: Add switch case for supported hardware to igb_ptp_remove. 2012-06-20 01:14:34 -07:00
igb.h igb: Update firmware info output 2012-06-20 01:36:23 -07:00
Makefile igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00