David S. Miller 4a35ecf8bf Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

e1000_82575.c

igb: add support for Intel I350 Gigabit Network Connection

2010-03-22 18:30:05 -07:00

e1000_82575.h

igb: add per-packet timestamping

2010-03-30 23:42:27 -07:00

e1000_defines.h

igb: add support for Intel I350 Gigabit Network Connection

2010-03-22 18:30:05 -07:00

e1000_hw.h

igb: update hw_debug macro to make use of netdev_dbg call

2010-03-30 23:02:26 -07:00

e1000_mac.c

igb: use correct bits to identify if managability is enabled

2010-03-27 08:33:20 -07:00

e1000_mac.h

igb: remove adaptive IFS from driver

2010-02-17 13:21:34 -08:00

e1000_mbx.c

igb: fix a few items where weren't correctly setup for mbx timeout

2009-10-06 14:59:21 -07:00

e1000_mbx.h

igb: rework use of VMOLR in regards to PF and VFs

2009-10-28 03:25:40 -07:00

e1000_nvm.c

igb: remove microwire support from igb

2009-10-06 14:59:22 -07:00

e1000_nvm.h

igb: PCI-Express 82575 Gigabit Ethernet driver

2008-01-28 15:10:33 -08:00

e1000_phy.c

igb: Power down link when interface is down

2010-02-17 13:21:33 -08:00

e1000_phy.h

igb: Power down link when interface is down

2010-02-17 13:21:33 -08:00

e1000_regs.h

igb: support for VF configuration tools

2010-02-12 16:56:09 -08:00

igb_ethtool.c

igb: add support for Intel I350 Gigabit Network Connection

2010-03-22 18:30:05 -07:00

igb_main.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-06 23:53:30 -07:00

igb.h

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-06 23:53:30 -07:00

Makefile

igb: Add support for enabling VFs to PF driver.

2009-02-20 00:22:54 -08:00