diff options
| -rw-r--r-- | CREDITS | 3 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/ata/sata_promise.c | 2 |
3 files changed, 3 insertions, 4 deletions
| @@ -2808,8 +2808,7 @@ S: Ottawa, Ontario | |||
| 2808 | S: Canada K2P 0X8 | 2808 | S: Canada K2P 0X8 |
| 2809 | 2809 | ||
| 2810 | N: Mikael Pettersson | 2810 | N: Mikael Pettersson |
| 2811 | E: mikpe@it.uu.se | 2811 | E: mikpelinux@gmail.com |
| 2812 | W: http://user.it.uu.se/~mikpe/linux/ | ||
| 2813 | D: Miscellaneous fixes | 2812 | D: Miscellaneous fixes |
| 2814 | 2813 | ||
| 2815 | N: Reed H. Petty | 2814 | N: Reed H. Petty |
diff --git a/MAINTAINERS b/MAINTAINERS index b2f857c7ecf6..c53fe9559642 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6596,7 +6596,7 @@ S: Obsolete | |||
| 6596 | F: drivers/net/wireless/prism54/ | 6596 | F: drivers/net/wireless/prism54/ |
| 6597 | 6597 | ||
| 6598 | PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER | 6598 | PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER |
| 6599 | M: Mikael Pettersson <mikpe@it.uu.se> | 6599 | M: Mikael Pettersson <mikpelinux@gmail.com> |
| 6600 | L: linux-ide@vger.kernel.org | 6600 | L: linux-ide@vger.kernel.org |
| 6601 | S: Maintained | 6601 | S: Maintained |
| 6602 | F: drivers/ata/sata_promise.* | 6602 | F: 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 | * |
