David S. Miller 6b08f51624 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-06-14 22:59:34 -07:00

..

cq_desc.h

…

cq_enet_desc.h

enic: Bug Fix: Fix hardware descriptor reads

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

enic_main.c

enic: bug fix: make the set/get netlink VF_PORT support symmetrical

2010-06-02 02:26:40 -07:00

enic_res.c

net: Add ndo_{set|get}_vf_port support for enic dynamic vnics

2010-05-17 22:50:19 -07:00

enic_res.h

net: Add ndo_{set|get}_vf_port support for enic dynamic vnics

2010-05-17 22:50:19 -07:00

enic.h

enic: bug fix: make the set/get netlink VF_PORT support symmetrical

2010-06-02 02:26:40 -07:00

Makefile

net: Add ndo_{set|get}_vf_port support for enic dynamic vnics

2010-05-17 22:50:19 -07:00

rq_enet_desc.h

…

vnic_cq.c

…

vnic_cq.h

…

vnic_dev.c

enic: fix pci_alloc_consistent argument

2010-06-12 15:23:45 -07:00

vnic_dev.h

net: Add ndo_{set|get}_vf_port support for enic dynamic vnics

2010-05-17 22:50:19 -07:00

vnic_devcmd.h

…

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

…

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

…

vnic_rss.h

…

vnic_stats.h

…

vnic_vic.c

enic: cleanup vic_provinfo_alloc()

2010-06-11 18:37:07 -07:00

vnic_vic.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

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

…

wq_enet_desc.h

…