Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
bnx2x_cmn.c	bnx2x: LSO code was broken on BE platforms	2010-12-12 15:02:58 -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: Fixed a compilation warning	2010-12-12 15:02:58 -08:00
bnx2x_init.h	bnx2x: Add 57712 support	2010-10-06 14:10:37 -07:00
bnx2x_link.c	bnx2x: Reset 8073 phy during common init	2010-11-01 06:21:39 -07: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' into for-next	2010-12-22 18:57:02 +01:00
bnx2x_reg.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04: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: Advance a version number to 1.60.01-0	2010-12-12 15:02:59 -08:00
Makefile	bnx2x: Move statistics handling code to bnx2x_stats.*	2010-07-27 20:35:42 -07:00