David S. Miller df597efb57 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-3945.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c		2009-07-30 19:22:43 -07:00
..
ixgbe_82598.c	ixgbe: Add device support for a new copper 82598 device	2009-07-17 09:47:38 -07:00
ixgbe_82599.c	ixgbe: Add FW detection and warning for 82599 SFP+ adapters	2009-06-07 05:20:26 -07:00
ixgbe_common.c	ixgbe: Add FW detection and warning for 82599 SFP+ adapters	2009-06-07 05:20:26 -07:00
ixgbe_common.h	ixgbe: Fix 82599 adapter link flickering issues	2009-06-07 05:20:19 -07:00
ixgbe_dcb_82598.c
ixgbe_dcb_82598.h
ixgbe_dcb_82599.c	ixgbe: Fix 82599 adapter link flickering issues	2009-06-07 05:20:19 -07:00
ixgbe_dcb_82599.h
ixgbe_dcb_nl.c	ixgbe: Enable FCoE offload when DCB is enabled for 82599	2009-07-23 11:05:30 -07:00
ixgbe_dcb.c
ixgbe_dcb.h
ixgbe_ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-30 19:22:43 -07:00
ixgbe_fcoe.c	convert some DMA_nnBIT_MASK() callers	2009-06-19 16:46:06 -07:00
ixgbe_fcoe.h	ixgbe: Include offloaded FCoE data into total rx/tx statistics for 82599	2009-06-09 05:25:37 -07:00
ixgbe_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-30 19:22:43 -07:00
ixgbe_phy.c	ixgbe: fix issues with failing to detect insert of unsupported module	2009-07-03 19:10:55 -07:00
ixgbe_phy.h
ixgbe_type.h	ixgbe: Add device support for a new copper 82598 device	2009-07-17 09:47:38 -07:00
ixgbe.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-30 19:22:43 -07:00
Makefile