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

..

cq_desc.h

enic: mask off some reserved bits in CQ descriptor for future use

2008-11-21 21:28:40 -08:00

cq_enet_desc.h

enic: Bug Fix: Fix hardware descriptor reads

2010-03-18 21:22:47 -07:00

enic_main.c

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

enic_res.c

enic: feature add: add ethtool -c/C support

2009-12-23 21:03:41 -08:00

enic_res.h

enic: provision for multiple Rx/Tx queues; prepare for RSS support

2009-09-03 20:19:19 -07:00

enic.h

enic: Clean up: Change driver description; Fix tab space; Update MAINTAINERS

2010-03-18 21:22:49 -07:00

Makefile

…

rq_enet_desc.h

…

vnic_cq.c

…

vnic_cq.h

…

vnic_dev.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

vnic_dev.h

enic: Clean up: Add wrapper functions

2010-03-18 21:22:49 -07:00

vnic_devcmd.h

enic: changes to driver/firmware interface

2009-09-03 20:19:23 -07:00

vnic_enet.h

enic: feature add: add ethtool -c/C support

2009-12-23 21:03:41 -08:00

vnic_intr.c

enic: feature add: add ethtool -c/C support

2009-12-23 21:03:41 -08:00

vnic_intr.h

enic: feature add: add ethtool -c/C support

2009-12-23 21:03:41 -08:00

vnic_nic.h

enic: whitespace cleanup; #define cleanup; more verbose err msg

2009-12-23 21:03:42 -08:00

vnic_resource.h

enic: misc cleanup items:

2008-11-21 21:29:25 -08:00

vnic_rq.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

vnic_rq.h

enic: organize device initialization/deinit into separate functions

2009-09-03 20:19:25 -07:00

vnic_rss.h

enic: misc cleanup items:

2008-11-21 21:29:25 -08:00

vnic_stats.h

…

vnic_wq.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

vnic_wq.h

enic: organize device initialization/deinit into separate functions

2009-09-03 20:19:25 -07:00

wq_enet_desc.h

…