diff options
author | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 16:33:43 +0200 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 16:37:41 +0200 |
commit | 95bb335c0ebe96afe926387a1ef3a096bd884a82 (patch) | |
tree | 56115332b4f2f7ef300c36248a6a7d20db2e639d /drivers/scsi/mpt2sas/mpt2sas_ctl.h | |
parent | [SCSI] libsas: fix deref before check in commit 70b25f890ce (diff) | |
parent | [SCSI] aacraid: add an ifdef'd device delete case instead of taking the devic... (diff) | |
download | linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.tar.xz linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.zip |
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.h')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.h b/drivers/scsi/mpt2sas/mpt2sas_ctl.h index 8a5eeb1a5c84..69916e46e04f 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.h +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.h @@ -3,7 +3,7 @@ * controllers * * This code is based on drivers/scsi/mpt2sas/mpt2_ctl.h - * Copyright (C) 2007-2009 LSI Corporation + * Copyright (C) 2007-2010 LSI Corporation * (mailto:DL-MPTFusionLinux@lsi.com) * * This program is free software; you can redistribute it and/or |