David S. Miller 1c01a80cfe Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/smsc911x.c		2011-04-11 13:44:25 -07:00
..
cxgb4_main.c	cxgb4: drop phys_id interface and implement the newer set_phys_id	2011-04-08 13:06:25 -07:00
cxgb4_uld.h	cxgb4: function namespace cleanup (v3)	2010-10-21 04:25:49 -07:00
cxgb4.h	cxgb4: remove a bitmap	2010-12-16 13:16:03 -08: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: NUMA-aware Tx queue allocations	2010-12-16 13:16:04 -08:00
t4_hw.c	Fix common misspellings	2011-03-31 11:26:23 -03: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	RDMA/cxgb4: Use ULP_MODE_TCPDDP	2011-03-14 12:09:12 -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: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports	2010-12-16 13:16:00 -08:00