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

Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c

2008-03-27 18:48:56 -07:00

..

adapter.h

cxgb3 - parity initialization for T3C adapters.

2008-01-28 15:07:22 -08:00

ael1002.c

cxgb3 - Fix direct XAUI support

2007-06-20 19:16:58 -04:00

common.h

annotate cxgb3

2008-01-28 15:10:30 -08:00

cxgb3_ctl_defs.h

cxgb3 - Expose HW memory page info

2007-10-10 16:50:49 -07:00

cxgb3_defs.h

cxgb3 - tighten checks on TID values

2007-10-10 16:50:49 -07:00

cxgb3_ioctl.h

cxgb3 - private ioctl cleanup

2007-02-27 04:27:12 -05:00

cxgb3_main.c

annotate cxgb3

2008-01-28 15:10:30 -08:00

cxgb3_offload.c

annotate cxgb3 (ab)uses of skb->priority/skb->csum

2008-03-26 00:18:46 -04:00

cxgb3_offload.h

cxgb3 - Fix dev->priv usage

2007-08-31 07:29:08 -04:00

firmware_exports.h

drivers/net/cxgb3: trim trailing whitespace

2008-01-28 15:04:13 -08:00

l2t.c

[NET] NEIGHBOUR: Remove unpopular neigh_is_connected().

2008-03-04 15:18:23 +09:00

l2t.h

cxgb3 Fix copyrights in the cxgb3 driver.

2007-02-17 15:30:46 -05:00

Makefile

Add support for the latest 1G/10G Chelsio adapter, T3.

2007-02-05 16:58:46 -05:00

mc5.c

cxgb3: Remove incorrect __devinit annotations

2008-02-03 04:28:35 -08:00

regs.h

cxgb3 - parity initialization for T3C adapters.

2008-01-28 15:07:22 -08:00

sge_defs.h

cxgb3 - Set the CQ_ERR bit in CQ contexts.

2007-10-10 16:51:05 -07:00

sge.c

cxgb3: Fix lockdep problems with sge.reg_lock

2008-03-25 23:42:05 -04:00

t3_cpl.h

cxgb3 - Add dual licensing

2007-02-05 16:58:51 -05:00

t3_hw.c

cxgb3: Remove incorrect __devinit annotations

2008-02-03 04:28:35 -08:00

t3cdev.h

cxgb3 - Fix dev->priv usage

2007-08-31 07:29:08 -04:00

version.h

cxgb3 - FW upgrade

2008-01-28 15:04:09 -08:00

vsc8211.c

cxgb3 - Add dual licensing

2007-02-05 16:58:51 -05:00

xgmac.c

drivers/net/cxgb3: trim trailing whitespace

2008-01-28 15:04:13 -08:00