summaryrefslogtreecommitdiff
path: root/Documentation/hwmon/hpfall.c
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-10-28 02:15:57 +0400
committerMichal Marek <mmarek@suse.cz>2010-10-28 02:15:57 +0400
commitb74b953b998bcc2db91b694446f3a2619ec32de6 (patch)
tree6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /Documentation/hwmon/hpfall.c
parentabb438526201c6a79949ad45375c051b6681c253 (diff)
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
downloadlinux-b74b953b998bcc2db91b694446f3a2619ec32de6.tar.xz
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c (commit eda603f).
Diffstat (limited to 'Documentation/hwmon/hpfall.c')
-rw-r--r--Documentation/hwmon/hpfall.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/hpfall.c b/Documentation/hwmon/hpfall.c
index 681ec22b9d0e..a4a8fc5d05d4 100644
--- a/Documentation/hwmon/hpfall.c
+++ b/Documentation/hwmon/hpfall.c
@@ -1,7 +1,7 @@
/* Disk protection for HP machines.
*
* Copyright 2008 Eric Piel
- * Copyright 2009 Pavel Machek <pavel@suse.cz>
+ * Copyright 2009 Pavel Machek <pavel@ucw.cz>
*
* GPLv2.
*/