The following commit has been merged in the linux branch: commit 57784dfa82fe032cf64613e154f3ae8748e3fa3d Author: Huaxu Wan huaxu.wan@linux.intel.com Date: Sat Oct 24 13:28:45 2009 +0200

hwmon: (coretemp) Maintainer update

Intel will help maintaining the coretemp driver.

Signed-off-by: Jean Delvare khali@linux-fr.org

diff --git a/MAINTAINERS b/MAINTAINERS index 8824115..46a18ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1480,6 +1480,7 @@ F: mm/*cgroup*

CORETEMP HARDWARE MONITORING DRIVER M: Rudolf Marek r.marek@assembler.cz +M: Huaxu Wan huaxu.wan@intel.com L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/coretemp