David S. Miller aba7453037 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/isdn/00-INDEX drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/rndis_wlan.c net/mac80211/main.c		2009-04-29 20:30:35 -07:00
..
ixgbe_82598.c	ixgbe: Use generic MDIO definitions and functions	2009-04-29 17:32:33 -07:00
ixgbe_82599.c	ixgbe: Use generic MDIO definitions and functions	2009-04-29 17:32:33 -07:00
ixgbe_common.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-04-29 20:30:35 -07:00
ixgbe_common.h	ixgbe: Move the LED blink code to common, since 82599 also uses it	2009-04-11 01:43:12 -07:00
ixgbe_dcb_82598.c	ixgbe: Allow Priority Flow Control settings to survive a device reset	2009-03-26 01:13:51 -07:00
ixgbe_dcb_82598.h
ixgbe_dcb_82599.c	ixgbe: Fix the DCB PFC thresholds for 82599	2009-04-17 01:16:28 -07:00
ixgbe_dcb_82599.h
ixgbe_dcb_nl.c	ixgbe: Fix DCB netlink layer for 82599 to enable Priority Flow Control	2009-04-02 01:02:28 -07:00
ixgbe_dcb.c
ixgbe_dcb.h
ixgbe_ethtool.c	ixgbe: enable HW RSC for 82599	2009-04-28 01:53:16 -07:00
ixgbe_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-04-29 20:30:35 -07:00
ixgbe_phy.c	ixgbe: Use generic MDIO definitions and functions	2009-04-29 17:32:33 -07:00
ixgbe_phy.h	ixgbe: Remove unnecessary PHY reset, properly identify multispeed fiber modules	2009-04-11 02:48:01 -07:00
ixgbe_type.h	ixgbe: Use generic MDIO definitions and functions	2009-04-29 17:32:33 -07:00
ixgbe.h	ixgbe: enable HW RSC for 82599	2009-04-28 01:53:16 -07:00
Makefile