diff options
-rw-r--r-- | Documentation/hwmon/k8temp | 2 | ||||
-rw-r--r-- | Documentation/hwmon/w83627ehf | 2 | ||||
-rw-r--r-- | Documentation/hwmon/w83791d | 2 | ||||
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | drivers/hwmon/hwmon-vid.c | 4 | ||||
-rw-r--r-- | drivers/hwmon/k8temp.c | 4 | ||||
-rw-r--r-- | drivers/hwmon/w83627ehf.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/w83792d.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ali1563.c | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/Documentation/hwmon/k8temp b/Documentation/hwmon/k8temp index 30d123b8d920..0005c7166146 100644 --- a/Documentation/hwmon/k8temp +++ b/Documentation/hwmon/k8temp | |||
@@ -8,7 +8,7 @@ Supported chips: | |||
8 | Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf | 8 | Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf |
9 | 9 | ||
10 | Author: Rudolf Marek | 10 | Author: Rudolf Marek |
11 | Contact: Rudolf Marek <r.marek@sh.cvut.cz> | 11 | Contact: Rudolf Marek <r.marek@assembler.cz> |
12 | 12 | ||
13 | Description | 13 | Description |
14 | ----------- | 14 | ----------- |
diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf index caa610a297e8..8a15a7408753 100644 --- a/Documentation/hwmon/w83627ehf +++ b/Documentation/hwmon/w83627ehf | |||
@@ -10,7 +10,7 @@ Supported chips: | |||
10 | Authors: | 10 | Authors: |
11 | Jean Delvare <khali@linux-fr.org> | 11 | Jean Delvare <khali@linux-fr.org> |
12 | Yuan Mu (Winbond) | 12 | Yuan Mu (Winbond) |
13 | Rudolf Marek <r.marek@sh.cvut.cz> | 13 | Rudolf Marek <r.marek@assembler.cz> |
14 | 14 | ||
15 | Description | 15 | Description |
16 | ----------- | 16 | ----------- |
diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d index 19b2ed739fa1..db9881df88a5 100644 --- a/Documentation/hwmon/w83791d +++ b/Documentation/hwmon/w83791d | |||
@@ -18,7 +18,7 @@ Credits: | |||
18 | and Mark Studebaker <mdsxyz123@yahoo.com> | 18 | and Mark Studebaker <mdsxyz123@yahoo.com> |
19 | w83792d.c: | 19 | w83792d.c: |
20 | Chunhao Huang <DZShen@Winbond.com.tw>, | 20 | Chunhao Huang <DZShen@Winbond.com.tw>, |
21 | Rudolf Marek <r.marek@sh.cvut.cz> | 21 | Rudolf Marek <r.marek@assembler.cz> |
22 | 22 | ||
23 | Additional contributors: | 23 | Additional contributors: |
24 | Sven Anders <anders@anduras.de> | 24 | Sven Anders <anders@anduras.de> |
diff --git a/MAINTAINERS b/MAINTAINERS index dbf449ba240c..c2eea2918e53 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -277,7 +277,7 @@ S: Maintained | |||
277 | 277 | ||
278 | ALI1563 I2C DRIVER | 278 | ALI1563 I2C DRIVER |
279 | P: Rudolf Marek | 279 | P: Rudolf Marek |
280 | M: r.marek@sh.cvut.cz | 280 | M: r.marek@assembler.cz |
281 | L: i2c@lm-sensors.org | 281 | L: i2c@lm-sensors.org |
282 | S: Maintained | 282 | S: Maintained |
283 | 283 | ||
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index 9d67320e6840..31c42002708f 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | hwmon-vid.c - VID/VRM/VRD voltage conversions | 2 | hwmon-vid.c - VID/VRM/VRD voltage conversions |
3 | 3 | ||
4 | Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz> | 4 | Copyright (c) 2004 Rudolf Marek <r.marek@assembler.cz> |
5 | 5 | ||
6 | Partly imported from i2c-vid.h of the lm_sensors project | 6 | Partly imported from i2c-vid.h of the lm_sensors project |
7 | Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> | 7 | Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> |
@@ -232,7 +232,7 @@ u8 vid_which_vrm(void) | |||
232 | EXPORT_SYMBOL(vid_from_reg); | 232 | EXPORT_SYMBOL(vid_from_reg); |
233 | EXPORT_SYMBOL(vid_which_vrm); | 233 | EXPORT_SYMBOL(vid_which_vrm); |
234 | 234 | ||
235 | MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>"); | 235 | MODULE_AUTHOR("Rudolf Marek <r.marek@assembler.cz>"); |
236 | 236 | ||
237 | MODULE_DESCRIPTION("hwmon-vid driver"); | 237 | MODULE_DESCRIPTION("hwmon-vid driver"); |
238 | MODULE_LICENSE("GPL"); | 238 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c index f58b64ed09e3..5d8d0ca08fa9 100644 --- a/drivers/hwmon/k8temp.c +++ b/drivers/hwmon/k8temp.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * k8temp.c - Linux kernel module for hardware monitoring | 2 | * k8temp.c - Linux kernel module for hardware monitoring |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Rudolf Marek <r.marek@sh.cvut.cz> | 4 | * Copyright (C) 2006 Rudolf Marek <r.marek@assembler.cz> |
5 | * | 5 | * |
6 | * Inspired from the w83785 and amd756 drivers. | 6 | * Inspired from the w83785 and amd756 drivers. |
7 | * | 7 | * |
@@ -286,7 +286,7 @@ static void __exit k8temp_exit(void) | |||
286 | pci_unregister_driver(&k8temp_driver); | 286 | pci_unregister_driver(&k8temp_driver); |
287 | } | 287 | } |
288 | 288 | ||
289 | MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>"); | 289 | MODULE_AUTHOR("Rudolf Marek <r.marek@assembler.cz>"); |
290 | MODULE_DESCRIPTION("AMD K8 core temperature monitor"); | 290 | MODULE_DESCRIPTION("AMD K8 core temperature monitor"); |
291 | MODULE_LICENSE("GPL"); | 291 | MODULE_LICENSE("GPL"); |
292 | 292 | ||
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 2257806d0102..212a1558c63b 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
@@ -3,7 +3,7 @@ | |||
3 | the Winbond W83627EHF Super-I/O chip | 3 | the Winbond W83627EHF Super-I/O chip |
4 | Copyright (C) 2005 Jean Delvare <khali@linux-fr.org> | 4 | Copyright (C) 2005 Jean Delvare <khali@linux-fr.org> |
5 | Copyright (C) 2006 Yuan Mu (Winbond), | 5 | Copyright (C) 2006 Yuan Mu (Winbond), |
6 | Rudolf Marek <r.marek@sh.cvut.cz> | 6 | Rudolf Marek <r.marek@assembler.cz> |
7 | David Hubbard <david.c.hubbard@gmail.com> | 7 | David Hubbard <david.c.hubbard@gmail.com> |
8 | 8 | ||
9 | Shamelessly ripped from the w83627hf driver | 9 | Shamelessly ripped from the w83627hf driver |
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 4e108262576f..b0fa296740d1 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -3,7 +3,7 @@ | |||
3 | monitoring | 3 | monitoring |
4 | Copyright (C) 2004, 2005 Winbond Electronics Corp. | 4 | Copyright (C) 2004, 2005 Winbond Electronics Corp. |
5 | Chunhao Huang <DZShen@Winbond.com.tw>, | 5 | Chunhao Huang <DZShen@Winbond.com.tw>, |
6 | Rudolf Marek <r.marek@sh.cvut.cz> | 6 | Rudolf Marek <r.marek@assembler.cz> |
7 | 7 | ||
8 | This program is free software; you can redistribute it and/or modify | 8 | This program is free software; you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c index 33fbb47100a3..8e1e3f8e40a4 100644 --- a/drivers/i2c/busses/i2c-ali1563.c +++ b/drivers/i2c/busses/i2c-ali1563.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * i2c-ali1563.c - i2c driver for the ALi 1563 Southbridge | 2 | * i2c-ali1563.c - i2c driver for the ALi 1563 Southbridge |
3 | * | 3 | * |
4 | * Copyright (C) 2004 Patrick Mochel | 4 | * Copyright (C) 2004 Patrick Mochel |
5 | * 2005 Rudolf Marek <r.marek@sh.cvut.cz> | 5 | * 2005 Rudolf Marek <r.marek@assembler.cz> |
6 | * | 6 | * |
7 | * The 1563 southbridge is deceptively similar to the 1533, with a | 7 | * The 1563 southbridge is deceptively similar to the 1533, with a |
8 | * few notable exceptions. One of those happens to be the fact they | 8 | * few notable exceptions. One of those happens to be the fact they |