diff --git a/[refs] b/[refs] index 881b060e703b..db36487baa4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a05e93f3b3fc2f53c1d0de3b17019e207c482349 +refs/heads/master: 968591298514167d05b0379377757ddefc76f022 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a1df54b0af79..5fa8451ec80c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1676,8 +1676,7 @@ F: kernel/cgroup* F: mm/*cgroup* CORETEMP HARDWARE MONITORING DRIVER -M: Rudolf Marek -M: Huaxu Wan +M: Fenghua Yu L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/coretemp