David S. Miller 5b9ab2ec04 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/hp-plus.c drivers/net/wireless/ath5k/base.c drivers/net/wireless/ath9k/recv.c net/wireless/reg.c		2008-11-26 23:48:40 -08:00
..
ixgbe_82598.c	ixgbe: add SFP+ driver support	2008-11-20 21:11:42 -08:00
ixgbe_common.c	ixgbe: Whitespace, copyright update and version number change patch	2008-09-24 18:55:05 -04:00
ixgbe_common.h	ixgbe: Whitespace, copyright update and version number change patch	2008-09-24 18:55:05 -04:00
ixgbe_dcb_82598.c	ixgbe: this patch adds support for DCB to the kernel and ixgbe driver	2008-11-20 20:52:10 -08:00
ixgbe_dcb_82598.h	ixgbe: this patch adds support for DCB to the kernel and ixgbe driver	2008-11-20 20:52:10 -08:00
ixgbe_dcb_nl.c	DCB: Add support for DCB BCN	2008-11-20 21:10:23 -08:00
ixgbe_dcb.c	ixgbe: this patch adds support for DCB to the kernel and ixgbe driver	2008-11-20 20:52:10 -08:00
ixgbe_dcb.h	DCB: Add support for DCB BCN	2008-11-20 21:10:23 -08:00
ixgbe_ethtool.c	ixgbe: convert directly reference of netdev->priv	2008-11-21 01:56:07 -08:00
ixgbe_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
ixgbe_phy.c	ixgbe: add SFP+ driver support	2008-11-20 21:11:42 -08:00
ixgbe_phy.h	ixgbe: add SFP+ driver support	2008-11-20 21:11:42 -08:00
ixgbe_type.h	ixgbe: add SFP+ driver support	2008-11-20 21:11:42 -08:00
ixgbe.h	DCB: fix kconfig option	2008-11-25 01:02:08 -08:00
Makefile	DCB: fix kconfig option	2008-11-25 01:02:08 -08:00