kernel-fxtec-pro1x/drivers/net/ixgbe
David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c
2010-04-11 14:53:53 -07:00
..
ixgbe.h ixgbe: cleanup maximum number of tx queues 2010-03-26 11:56:02 -07:00
ixgbe_82598.c ixgbe: Fix - Do not allow Rx FC on 82598 at 1G due to errata 2010-02-15 21:51:56 -08:00
ixgbe_82599.c net/intel: remove trailing space in messages 2010-03-24 14:10:22 -07:00
ixgbe_common.c net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00
ixgbe_common.h ixgbe: convert to use netdev_for_each_mc_addr 2010-03-26 20:10:03 -07:00
ixgbe_dcb.c ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82598.c ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82598.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82599.c ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82599.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_nl.c ixgbe: if ixgbe_copy_dcb_cfg is going to fail learn about it early 2010-01-28 05:55:54 -08:00
ixgbe_ethtool.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixgbe_fcoe.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixgbe_fcoe.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_main.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
ixgbe_mbx.c ixgbe: Mailbox header and code module 2010-01-10 13:34:24 -08:00
ixgbe_mbx.h ixgbe: Mailbox header and code module 2010-01-10 13:34:24 -08:00
ixgbe_phy.c net/intel: remove trailing space in messages 2010-03-24 14:10:22 -07:00
ixgbe_phy.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_sriov.c ixgbe: Improve reset coordination between the PF and the VF 2010-01-23 01:13:55 -08:00
ixgbe_sriov.h ixgbe: Improve reset coordination between the PF and the VF 2010-01-23 01:13:55 -08:00
ixgbe_type.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-06 23:53:30 -07:00
Makefile Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-01-23 00:31:06 -08:00