diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /drivers/scsi/aacraid/nark.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'drivers/scsi/aacraid/nark.c')
| -rw-r--r-- | drivers/scsi/aacraid/nark.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/nark.c b/drivers/scsi/aacraid/nark.c index c55f7c862f0..f397d21a0c0 100644 --- a/drivers/scsi/aacraid/nark.c +++ b/drivers/scsi/aacraid/nark.c | |||
| @@ -4,7 +4,8 @@ | |||
| 4 | * based on the old aacraid driver that is.. | 4 | * based on the old aacraid driver that is.. |
| 5 | * Adaptec aacraid device driver for Linux. | 5 | * Adaptec aacraid device driver for Linux. |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007 Adaptec, Inc. (aacraid@adaptec.com) | 7 | * Copyright (c) 2000-2010 Adaptec, Inc. |
| 8 | * 2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com) | ||
| 8 | * | 9 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |