alistair23-linux/drivers/net/bnx2x
Linus Torvalds c55d267de2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}
2011-03-17 17:54:40 -07:00
..
bnx2x.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-03-10 14:26:00 -08:00
bnx2x_cmn.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-03-10 14:26:00 -08:00
bnx2x_cmn.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-03-10 14:26:00 -08:00
bnx2x_dcb.c bnx2x: use dcb_setapp to manage negotiated application tlvs 2011-02-28 12:19:55 -08:00
bnx2x_dcb.h bnx2x: use dcb_setapp to manage negotiated application tlvs 2011-02-28 12:19:55 -08:00
bnx2x_dump.h bnx2x: registers dump fixes 2011-01-09 15:47:38 -08:00
bnx2x_ethtool.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-03-10 14:26:00 -08: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, cnic: Consolidate iSCSI/FCoE shared mem logic in bnx2x 2011-01-31 20:44:46 -08:00
bnx2x_init.h bnx2x: Add a missing bit for PXP parity register of 57712. 2011-02-27 16:05:48 -08:00
bnx2x_init_ops.h bnx2x: Fixed a compilation warning 2010-12-12 15:02:58 -08:00
bnx2x_link.c bnx2x: Remove support for emulation/FPGA 2011-01-31 13:22:44 -08:00
bnx2x_link.h bnx2x: Fix compilation warning messages 2011-01-31 13:22:41 -08:00
bnx2x_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2011-03-17 17:54:40 -07:00
bnx2x_reg.h bnx2x: Enhance SFP+ module control 2011-01-31 13:22:43 -08:00
bnx2x_stats.c bnx2x: perform statistics "action" before state transition. 2011-02-28 13:14:48 -08:00
bnx2x_stats.h bnx2x: add FCoE ring 2010-12-16 13:15:54 -08:00
Makefile bnx2x: add DCB support 2010-12-16 13:15:55 -08:00