diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 13:25:44 -0400 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 13:25:44 -0400 |
| commit | 3bc4f3993b93dbf1f6402e2034a2e20eb07db807 (patch) | |
| tree | 592283e59e121b76355836295d6016fe33cfc5d1 /drivers/scsi/mpt2sas/mpi/mpi2_raid.h | |
| parent | 17638db1b88184d8895f3f4551c936d7480a1d3f (diff) | |
| parent | cb3e4330e697dffaf3d9cefebc9c7e7d39c89f2e (diff) | |
Merge remote branch 'origin/master' into next-merge
Diffstat (limited to 'drivers/scsi/mpt2sas/mpi/mpi2_raid.h')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_raid.h b/drivers/scsi/mpt2sas/mpi/mpi2_raid.h index 255b0ca219a4..0d202a2c6db7 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2_raid.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2_raid.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2000-2012 LSI Corporation. | 2 | * Copyright (c) 2000-2013 LSI Corporation. |
| 3 | * | 3 | * |
| 4 | * | 4 | * |
| 5 | * Name: mpi2_raid.h | 5 | * Name: mpi2_raid.h |