David S. Miller 8b3f6af863 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h		2009-09-24 15:13:11 -07:00
..
e1000_82575.c	igb: reset sgmii phy at start of init	2009-09-14 17:03:49 -07:00
e1000_82575.h	igb: reset sgmii phy at start of init	2009-09-14 17:03:49 -07:00
e1000_defines.h	igb: reset sgmii phy at start of init	2009-09-14 17:03:49 -07:00
e1000_hw.h	igb: cleanup flow control configuration to make requested/current more clear	2009-07-26 09:47:02 -07:00
e1000_mac.c	igb: resolve namespacecheck warning for igb_hash_mc_addr	2009-09-21 11:32:33 -07:00
e1000_mac.h	igb: resolve namespacecheck warning for igb_hash_mc_addr	2009-09-21 11:32:33 -07:00
e1000_mbx.c	igb: reconfigure mailbox timeout logic	2009-04-28 01:53:12 -07:00
e1000_mbx.h	igb: fix unused external references introduced with sr-iov changes	2009-04-11 02:55:12 -07:00
e1000_nvm.c	igb: update version number and copyright dates	2009-02-07 02:43:17 -08:00
e1000_nvm.h
e1000_phy.c	igb: do not allow phy sw reset code to make calls to null pointers	2009-09-14 17:03:54 -07:00
e1000_phy.h	igb/e1000e: update PSSR_MDIX value to reflect correct bit	2009-05-26 20:35:06 -07:00
e1000_regs.h	igb: add completion timeout workaround for 82575/82576	2009-07-26 09:46:49 -07:00
igb.h	igb: set vf rlpml wasn't taking vlan tag into account	2009-09-03 20:01:50 -07:00
igb_ethtool.c	netdev: drivers should make ethtool_ops const	2009-09-02 01:03:33 -07:00
igb_main.c	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
Makefile	igb: Add support for enabling VFs to PF driver.	2009-02-20 00:22:54 -08:00