diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 10:09:22 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 10:09:29 +0200 |
commit | 864bfb25b57a6766ea689befa5cf09a4353281ce (patch) | |
tree | 478941ca6e76b8d77b71f5827a3ce751c46a72b5 /Documentation/hwmon/jc42 | |
parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) | |
parent | 49717cb40410fe4b563968680ff7c513967504c6 (diff) |
Merge branch 'master' into for-next
Merge with 49717cb ("kthread: Document ways of reducing OS jitter due
to per-CPU kthreads") to be able to apply fixup patch on top of it.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/hwmon/jc42')
-rw-r--r-- | Documentation/hwmon/jc42 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/jc42 b/Documentation/hwmon/jc42 index 165077121238..868d74d6b773 100644 --- a/Documentation/hwmon/jc42 +++ b/Documentation/hwmon/jc42 @@ -49,7 +49,7 @@ Supported chips: Addresses scanned: I2C 0x18 - 0x1f Author: - Guenter Roeck <guenter.roeck@ericsson.com> + Guenter Roeck <linux@roeck-us.net> Description |