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	Neterion: New driver: Kconfig and Makefile	2009-04-02 00:33:46 -07:00
vxge-config.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
vxge-config.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
vxge-ethtool.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
vxge-ethtool.h	Neterion: New driver: Ethtool related	2009-04-02 00:33:44 -07:00
vxge-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
vxge-main.h	vxge: Pass correct number of VFs value to pci_sriov_enable().	2010-04-08 01:48:57 -07:00
vxge-reg.h	vxge: Removed accessing non-supported registers.	2009-10-06 15:22:52 -07:00
vxge-traffic.c	vxge: Fixed MSIX interrupt configuration.	2010-03-29 16:57:22 -07:00
vxge-traffic.h	vxge: Fixed MSIX interrupt configuration.	2010-03-29 16:57:22 -07:00
vxge-version.h	vxge: Version update.	2010-04-08 01:49:19 -07:00