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
..
Makefile	igbvf: add new driver to support 82576 virtual functions	2009-04-08 16:03:14 -07:00
defines.h	igbvf: add new driver to support 82576 virtual functions	2009-04-08 16:03:14 -07:00
ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-27 01:03:26 -07:00
igbvf.h	igbvf: do not modify tx_queue_len on link speed change	2010-03-26 21:01:41 -07:00
mbx.c	igbvf: add new driver to support 82576 virtual functions	2009-04-08 16:03:14 -07:00
mbx.h	igbvf: add new driver to support 82576 virtual functions	2009-04-08 16:03:14 -07:00
netdev.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
regs.h	igbvf: add new driver to support 82576 virtual functions	2009-04-08 16:03:14 -07:00
vf.c	igbvf: Allow VF driver to correctly recognize failure to set mac	2009-08-04 11:46:41 -07:00
vf.h	igbvf: fix unused external references	2009-04-11 02:55:14 -07:00