diff --git a/[refs] b/[refs] index 75a2b177a666..12bc89b01c0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c7fd30da21bf6bda12d7a0f678e4fd8ed362c96 +refs/heads/master: 4aa3eb4cbe0e6f307f7b4d37a8475bace51b773b diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 836a6183c37f..6abd5ae3a681 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5406,6 +5406,13 @@ L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/NCR_D700.* +NCT6775 HARDWARE MONITOR DRIVER +M: Guenter Roeck +L: lm-sensors@lm-sensors.org +S: Maintained +F: Documentation/hwmon/nct6775 +F: drivers/hwmon/nct6775.c + NETEFFECT IWARP RNIC DRIVER (IW_NES) M: Faisal Latif L: linux-rdma@vger.kernel.org