summaryrefslogtreecommitdiffstats
path: root/drivers/net/enic/enic_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-15 02:32:56 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-15 02:32:56 +0100
commit85cb7f1264c4d9e60ccdce52740238222e77ccd0 (patch)
tree08a5e5af412bdc16576b252c54466d3807d6f25f /drivers/net/enic/enic_main.c
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe... (diff)
parent[SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF (diff)
downloadlinux-85cb7f1264c4d9e60ccdce52740238222e77ccd0.tar.xz
linux-85cb7f1264c4d9e60ccdce52740238222e77ccd0.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF [SCSI] qla2xxx: Update version number to 8.03.05-k0. [SCSI] qla2xxx: Properly set the return value in qla2xxx_eh_abort function. [SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts. [SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter. [SCSI] qla2xxx: Populate Command Type 6 LUN field properly. [SCSI] zfcp: Issue FCP command without holding SCSI host_lock [SCSI] zfcp: Prevent usage w/o holding a reference [SCSI] zfcp: No ERP escalation on gpn_ft eval [SCSI] zfcp: Correct false abort data assignment. [SCSI] zfcp: Fix common FCP request reception [SCSI] Eliminate error handler overload of the SCSI serial number [SCSI] pmcraid: disable msix and expand device config entry [SCSI] bsg: correct fault if queue object removed while dev_t open [SCSI] osd: checking NULL instead of ERR_PTR()
Diffstat (limited to 'drivers/net/enic/enic_main.c')
0 files changed, 0 insertions, 0 deletions