diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
commit | b4c43993f448d0e25fe40690d9e9c81a8ebda623 (patch) | |
tree | 7cc19990b0b00226ce3063d956790368bfe62ada /Documentation | |
parent | include/scsi/osd_protocol.h: remove unnecessary __constant (diff) | |
parent | mvsas: Recognise device/subsystem 9485/9485 as 88SE9485 (diff) | |
download | linux-dev-b4c43993f448d0e25fe40690d9e9c81a8ebda623.tar.xz linux-dev-b4c43993f448d0e25fe40690d9e9c81a8ebda623.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/scsi/LICENSE.qla2xxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/LICENSE.qla2xxx b/Documentation/scsi/LICENSE.qla2xxx index 5020b7b5a244..52f0b4359234 100644 --- a/Documentation/scsi/LICENSE.qla2xxx +++ b/Documentation/scsi/LICENSE.qla2xxx @@ -1,4 +1,4 @@ -Copyright (c) 2003-2013 QLogic Corporation +Copyright (c) 2003-2014 QLogic Corporation QLogic Linux FC-FCoE Driver This program includes a device driver for Linux 3.x. |