David S. Miller d4a66e752d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/benet/be_cmds.h include/linux/sysctl.h		2010-01-10 22:55:03 -08:00
..
Makefile	Neterion: New driver: Kconfig and Makefile	2009-04-02 00:33:46 -07:00
vxge-config.c	vxge: Allow multiple functions with INTA.	2009-10-06 15:22:55 -07:00
vxge-config.h	vxge: Check if FCS stripping is disabled by the firmware.	2009-10-06 15:22:54 -07:00
vxge-ethtool.c	Neterion: New driver: Ethtool related	2009-04-02 00:33:44 -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-01-10 22:55:03 -08:00
vxge-main.h	vxge: Allow multiple functions with INTA.	2009-10-06 15:22:55 -07:00
vxge-reg.h	vxge: Removed accessing non-supported registers.	2009-10-06 15:22:52 -07:00
vxge-traffic.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
vxge-traffic.h	vxge: Allow multiple functions with INTA.	2009-10-06 15:22:55 -07:00
vxge-version.h	vxge: Configure the number of transmit descriptors per packet to MAX_SKB_FRAGS + 1.	2009-10-28 02:46:54 -07:00