diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 22:29:52 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 22:29:52 -0600 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/qla2xxx/ql6312.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
Merge by Hand
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/ql6312.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/ql6312.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/ql6312.c b/drivers/scsi/qla2xxx/ql6312.c index e75882dd4cf6..de55397f6f4c 100644 --- a/drivers/scsi/qla2xxx/ql6312.c +++ b/drivers/scsi/qla2xxx/ql6312.c @@ -1,10 +1,9 @@ /* - * QLogic ISP6312 device driver for Linux 2.6.x - * Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) + * QLogic Fibre Channel HBA Driver + * Copyright (c) 2003-2005 QLogic Corporation * - * Released under GPL v2. + * See LICENSE.qla2xxx for copyright and licensing details. */ - #include <linux/init.h> #include <linux/module.h> #include <linux/pci.h> |