diff --git a/[refs] b/[refs] index cfd1e091b2b8..ac6c9c2eee6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 581693b51e44bb2c0cca16ab0c8d3cb535fd2ac8 +refs/heads/master: c6c2c1636e30bcd26c6b0d208324055a03c5ab9c diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface index 5997b5efc1cb..c6559f153589 100644 --- a/trunk/Documentation/hwmon/sysfs-interface +++ b/trunk/Documentation/hwmon/sysfs-interface @@ -505,6 +505,15 @@ energy[1-*]_input Cumulative energy use RO +************ +* Humidity * +************ + +humidity[1-*]_input Humidity + Unit: milli-percent (per cent mille, pcm) + RO + + ********** * Alarms * **********