Merge tag 'extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / aacraid / nark.c

diff --git a/drivers/scsi/aacraid/nark.c b/drivers/scsi/aacraid/nark.c
index 6c53b1d8b2badc6070a7a2d5cb3f13b42cd47fac..c59074e782d627f768f8f2c92d9d87d167aa8afc 100644 (file)
--- a/drivers/scsi/aacraid/nark.c
+++ b/drivers/scsi/aacraid/nark.c
@@ -5,7 +5,8 @@
  * Adaptec aacraid device driver for Linux.
  *
  * Copyright (c) 2000-2010 Adaptec, Inc.
- *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
+ *               2010-2015 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
+ *              2016-2017 Microsemi Corp. (aacraid@microsemi.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by