diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
commit | 19ac97ff701ae3c0eda09dd88f590806f1c4eb2d (patch) | |
tree | 62bb6b6358783dc9d6c26f480fa378843abb0235 /drivers/scsi/mpt2sas/mpt2sas_ctl.c | |
parent | 24c20f10583647e30afe87b6f6d5e14bc7b1cbc6 (diff) | |
parent | e785060ea3a1c8e37a8bc1449c79e36bff2b5b13 (diff) | |
download | talos-obmc-linux-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.tar.gz talos-obmc-linux-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.c')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c index 62df8f9d4271..ca4e563c01dd 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c @@ -3,7 +3,7 @@ * controllers * * This code is based on drivers/scsi/mpt2sas/mpt2_ctl.c - * Copyright (C) 2007-2013 LSI Corporation + * Copyright (C) 2007-2014 LSI Corporation * (mailto:DL-MPTFusionLinux@lsi.com) * * This program is free software; you can redistribute it and/or |