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

Conflicts:
	drivers/net/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c

2010-11-19 13:13:47 -08:00

..

bnx2x_cmn.c

bnx2x: Look inside vlan when determining checksum proto.

2010-11-12 12:30:57 -08:00

bnx2x_cmn.h

bnx2x: make local function static and remove dead code

2010-10-24 15:07:13 -07:00

bnx2x_dump.h

bnx2x: Add 57712 support

2010-10-06 14:10:37 -07:00

bnx2x_ethtool.c

bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.

2010-10-21 19:59:32 -07:00

bnx2x_fw_defs.h

bnx2x, cnic, bnx2i: use new FW/HSI

2010-10-06 14:10:35 -07:00

bnx2x_fw_file_hdr.h

bnx2x, cnic, bnx2i: use new FW/HSI

2010-10-06 14:10:35 -07:00

bnx2x_hsi.h

bnx2x: Do not enable CL37 BAM unless it is explicitly enabled

2010-11-01 06:21:38 -07:00

bnx2x_init_ops.h

bnx2x: make local function static and remove dead code

2010-10-24 15:07:13 -07:00

bnx2x_init.h

bnx2x: Add 57712 support

2010-10-06 14:10:37 -07:00

bnx2x_link.c

drivers/net/bnx2x: Remove unnecessary semicolons

2010-11-15 11:06:18 -08:00

bnx2x_link.h

bnx2x: make local function static and remove dead code

2010-10-24 15:07:13 -07:00

bnx2x_main.c

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

2010-11-19 13:13:47 -08:00

bnx2x_reg.h

bnx2x: prevent false parity error in MSI-X memory of HC block

2010-10-19 08:37:37 -07:00

bnx2x_stats.c

bnx2x: properly initialize FW stats

2010-10-06 14:10:41 -07:00

bnx2x_stats.h

bnx2x: code beautify

2010-10-06 14:10:41 -07:00

bnx2x.h

bnx2x: Update version number

2010-11-01 06:21:39 -07:00

Makefile

…