diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 22:48:12 +0200 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 22:48:12 +0200 |
commit | 19ac97ff701ae3c0eda09dd88f590806f1c4eb2d (patch) | |
tree | 62bb6b6358783dc9d6c26f480fa378843abb0235 /drivers/scsi/mpt3sas/mpt3sas_transport.c | |
parent | scsi: add a CONFIG_SCSI_MQ_DEFAULT option (diff) | |
parent | ufs: definitions for phy interface (diff) | |
download | linux-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.tar.xz linux-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_transport.c')
-rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c index 65170cb1a00f..d4bafaaebea9 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_transport.c +++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c @@ -2,7 +2,7 @@ * SAS Transport Layer for MPT (Message Passing Technology) based controllers * * This code is based on drivers/scsi/mpt3sas/mpt3sas_transport.c - * Copyright (C) 2012-2013 LSI Corporation + * Copyright (C) 2012-2014 LSI Corporation * (mailto:DL-MPTFusionLinux@lsi.com) * * This program is free software; you can redistribute it and/or |