diff --git a/[refs] b/[refs] index 523d84f5261e..d43762f9f4f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb02755a50f8f3508030b311e3788426fbdc23b7 +refs/heads/master: e3760b432d589ddd9bdb8c337539b815125bc7aa diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1e6b6bdf6340..19f262c27323 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6457,6 +6457,12 @@ S: Maintained F: Documentation/hwmon/w83793 F: drivers/hwmon/w83793.c +W83795 HARDWARE MONITORING DRIVER +M: Jean Delvare +L: lm-sensors@lm-sensors.org +S: Maintained +F: drivers/hwmon/w83795.c + W83L51xD SD/MMC CARD INTERFACE DRIVER M: Pierre Ossman S: Maintained diff --git a/trunk/drivers/hwmon/w83795.c b/trunk/drivers/hwmon/w83795.c index ce1e71ba6c73..a9116ad747f2 100644 --- a/trunk/drivers/hwmon/w83795.c +++ b/trunk/drivers/hwmon/w83795.c @@ -2,6 +2,7 @@ * w83795.c - Linux kernel driver for hardware monitoring * Copyright (C) 2008 Nuvoton Technology Corp. * Wei Song + * Copyright (C) 2010 Jean Delvare * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2097,7 +2098,7 @@ static void __exit sensors_w83795_exit(void) i2c_del_driver(&w83795_driver); } -MODULE_AUTHOR("Wei Song"); +MODULE_AUTHOR("Wei Song, Jean Delvare "); MODULE_DESCRIPTION("W83795G/ADG hardware monitoring driver"); MODULE_LICENSE("GPL");