diff --git a/[refs] b/[refs] index dce60f5c51e2..0fa7bd983ea7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5facb097137e7509a1b73448fe20226a4fbfe8cb +refs/heads/master: 9e012c1acc1fd617a708c00ff1fdaa847f9faf67 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index e7c528ff1013..8540dea232af 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2657,9 +2657,12 @@ S: Maintained F: drivers/media/video/gspca/ HARDWARE MONITORING +M: Jean Delvare +M: Guenter Roeck L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ -S: Orphan +T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +S: Maintained F: Documentation/hwmon/ F: drivers/hwmon/ F: include/linux/hwmon*.h