diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 08:45:39 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 08:45:39 (GMT) |
| commit | eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 (patch) | |
| tree | c05d5d6ca3f625d72a9d136b4c485d3dc9472089 /Documentation/hwmon/gl518sm | |
| parent | be1e4e760d940c14d119bffef5eb007dfdf29046 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
| download | linux-eaa4e4fcf1b5c60e656d93242f7fe422173f25b2.tar.xz | |
Merge branch 'linus' into sched/core, to resolve conflicts
Conflicts:
kernel/sysctl.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/hwmon/gl518sm')
| -rw-r--r-- | Documentation/hwmon/gl518sm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/gl518sm b/Documentation/hwmon/gl518sm index 26f9f3c..494bb55 100644 --- a/Documentation/hwmon/gl518sm +++ b/Documentation/hwmon/gl518sm @@ -14,7 +14,7 @@ Authors: Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki <kmalkki@cc.hut.fi> Hong-Gunn Chew <hglinux@gunnet.org> - Jean Delvare <khali@linux-fr.org> + Jean Delvare <jdelvare@suse.de> Description ----------- |