OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
871039f02f
linux/drivers/net/vxge
History
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
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
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-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