aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS3
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/ata/sata_promise.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 9416a9a8b95e..0640e1650483 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario
2808S: Canada K2P 0X8 2808S: Canada K2P 0X8
2809 2809
2810N: Mikael Pettersson 2810N: Mikael Pettersson
2811E: mikpe@it.uu.se 2811E: mikpelinux@gmail.com
2812W: http://user.it.uu.se/~mikpe/linux/
2813D: Miscellaneous fixes 2812D: Miscellaneous fixes
2814 2813
2815N: Reed H. Petty 2814N: Reed H. Petty
diff --git a/MAINTAINERS b/MAINTAINERS
index b2f857c7ecf6..c53fe9559642 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6596,7 +6596,7 @@ S: Obsolete
6596F: drivers/net/wireless/prism54/ 6596F: drivers/net/wireless/prism54/
6597 6597
6598PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER 6598PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
6599M: Mikael Pettersson <mikpe@it.uu.se> 6599M: Mikael Pettersson <mikpelinux@gmail.com>
6600L: linux-ide@vger.kernel.org 6600L: linux-ide@vger.kernel.org
6601S: Maintained 6601S: Maintained
6602F: drivers/ata/sata_promise.* 6602F: drivers/ata/sata_promise.*
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 958ba2a420c3..97f4acb54ad6 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -2,7 +2,7 @@
2 * sata_promise.c - Promise SATA 2 * sata_promise.c - Promise SATA
3 * 3 *
4 * Maintained by: Tejun Heo <tj@kernel.org> 4 * Maintained by: Tejun Heo <tj@kernel.org>
5 * Mikael Pettersson <mikpe@it.uu.se> 5 * Mikael Pettersson
6 * Please ALWAYS copy linux-ide@vger.kernel.org 6 * Please ALWAYS copy linux-ide@vger.kernel.org
7 * on emails. 7 * on emails.
8 * 8 *