David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
e1000_82575.c	igb: move the generic copper link setup code into e1000_phy.c	2009-10-06 14:59:23 -07:00
e1000_82575.h	igb: use packet buffer sizes from RXPBS register	2009-10-28 03:25:38 -07:00
e1000_defines.h	igb: cleanup some of the code related to hw timestamping	2009-10-28 03:25:33 -07:00
e1000_hw.h	igb: remove microwire support from igb	2009-10-06 14:59:22 -07:00
e1000_mac.c	igb: add flushes between RAR writes when setting mac address	2009-10-06 14:59:24 -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: 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
e1000_phy.c	igb: add additional error handling to the phy code	2009-10-06 14:59:24 -07:00
e1000_phy.h	igb: move the generic copper link setup code into e1000_phy.c	2009-10-06 14:59:23 -07:00
e1000_regs.h	igb: use packet buffer sizes from RXPBS register	2009-10-28 03:25:38 -07:00
igb_ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
igb_main.c	igb: only recycle page if it is on our numa node	2009-11-13 20:46:53 -08:00
igb.h	igb: removed unused tx/rx total bytes/packets from adapter struct	2009-11-13 20:46:51 -08:00
Makefile	igb: Add support for enabling VFs to PF driver.	2009-02-20 00:22:54 -08:00