David S. Miller 1b63ba8a86 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl4965-base.c		2008-06-28 01:19:40 -07:00
..
ixgbe_82598.c	ixgbe: fix typo	2008-06-10 18:20:15 -04:00
ixgbe_common.c	drivers/net/ixgb: Add missing "space"	2008-01-28 15:03:55 -08:00
ixgbe_common.h
ixgbe_ethtool.c	ixgbe: Introduce adaptive interrupt moderation	2008-03-17 07:49:28 -04:00
ixgbe_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-28 01:19:40 -07:00
ixgbe_phy.c
ixgbe_phy.h	ixgbe: Fix copper PHY initialization code	2008-01-28 15:03:44 -08:00
ixgbe_type.h	ixgbe endianness annotations	2008-01-28 15:07:15 -08:00
ixgbe.h	ixgbe: Add optional DCA infrastructure	2008-03-17 07:49:28 -04:00
Makefile