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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c

2010-12-08 13:47:38 -08:00

..

cxgb4_main.c

drivers/net: use vzalloc()

2010-11-27 22:53:38 -08:00

cxgb4_uld.h

cxgb4: function namespace cleanup (v3)

2010-10-21 04:25:49 -07:00

cxgb4.h

cxgb4: update to utilize the newer VLAN infrastructure

2010-10-24 15:52:31 -07:00

l2t.c

cxgb4: function namespace cleanup (v3)

2010-10-21 04:25:49 -07:00

l2t.h

cxgb4: function namespace cleanup (v3)

2010-10-21 04:25:49 -07:00

Makefile

…

sge.c

cxgb4: update to utilize the newer VLAN infrastructure

2010-10-24 15:52:31 -07:00

t4_hw.c

cxgb4: fix MAC address hash filter

2010-12-08 09:36:22 -08:00

t4_hw.h

cxgb4: support eeprom read/write on functions other than 0

2010-08-23 20:38:14 -07:00

t4_msg.h

cxgb4: don't offload Rx checksums for IPv6 fragments

2010-08-02 16:26:41 -07:00

t4_regs.h

cxgb4: get on-chip queue info from FW and create a memory window for them

2010-08-02 16:26:42 -07:00

t4fw_api.h

cxgb4: handle Rx/Tx queue ranges not starting at 0

2010-08-23 20:38:13 -07:00