diff --git a/[refs] b/[refs]
index 800c79333e6e..d97fcf862e8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90534c5c5e535d7bf78a4efdbd0999e04b57d6e3
+refs/heads/master: 156e2d1adc03e17f18f98d297f7757fc6d93a589
diff --git a/trunk/Documentation/hwmon/lm78 b/trunk/Documentation/hwmon/lm78
index 60932e26abaa..2bdc881a0c12 100644
--- a/trunk/Documentation/hwmon/lm78
+++ b/trunk/Documentation/hwmon/lm78
@@ -13,7 +13,8 @@ Supported chips:
     Datasheet: Publicly available at the National Semiconductor website
                http://www.national.com/
 
-Author: Frodo Looijaard <frodol@dds.nl>
+Authors: Frodo Looijaard <frodol@dds.nl>
+         Jean Delvare <khali@linux-fr.org>
 
 Description
 -----------
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 43392c9ef4c3..602647847186 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3960,6 +3960,13 @@ L:	lm-sensors@lm-sensors.org
 S:	Maintained
 F:	drivers/hwmon/lm73.c
 
+LM78 HARDWARE MONITOR DRIVER
+M:	Jean Delvare <khali@linux-fr.org>
+L:	lm-sensors@lm-sensors.org
+S:	Maintained
+F:	Documentation/hwmon/lm78
+F:	drivers/hwmon/lm78.c
+
 LM83 HARDWARE MONITOR DRIVER
 M:	Jean Delvare <khali@linux-fr.org>
 L:	lm-sensors@lm-sensors.org
diff --git a/trunk/drivers/hwmon/lm78.c b/trunk/drivers/hwmon/lm78.c
index 05290e34a1be..6df0b4681710 100644
--- a/trunk/drivers/hwmon/lm78.c
+++ b/trunk/drivers/hwmon/lm78.c
@@ -1060,9 +1060,7 @@ static void __exit sm_lm78_exit(void)
 	i2c_del_driver(&lm78_driver);
 }
 
-
-
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
+MODULE_AUTHOR("Frodo Looijaard, Jean Delvare <khali@linux-fr.org>");
 MODULE_DESCRIPTION("LM78/LM79 driver");
 MODULE_LICENSE("GPL");