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

Conflicts:
	net/mac80211/main.c

2010-09-09 22:27:33 -07:00

..

Makefile

…

qlcnic_ctx.c

qlcnic: fix mac override capability

2010-09-01 10:41:56 -07:00

qlcnic_ethtool.c

qlcnic: add api version in reg dump

2010-09-01 10:41:53 -07:00

qlcnic_hdr.h

qlcnic: backout firmware initialization update

2010-09-01 10:41:53 -07:00

qlcnic_hw.c

qlcnic: mac vlan learning support

2010-09-01 10:41:57 -07:00

qlcnic_init.c

drivers/net: avoid some skb->ip_summed initializations

2010-09-02 19:06:22 -07:00

qlcnic_main.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-09-09 22:27:33 -07:00

qlcnic.h

qlcnic: add cksum flag

2010-09-01 10:41:58 -07:00