On Mon, Sep 13, 2010 at 12:17:18PM -0400, Jean Delvare wrote: > On Thu, 9 Sep 2010 06:25:44 -0700, Guenter Roeck wrote: > > Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx> > > --- > > Documentation/hwmon/sysfs-interface | 1 + > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface > > index 101300b..22843cb 100644 > > --- a/Documentation/hwmon/sysfs-interface > > +++ b/Documentation/hwmon/sysfs-interface > > @@ -513,6 +513,7 @@ fan[1-*]_max_alarm > > temp[1-*]_min_alarm > > temp[1-*]_max_alarm > > temp[1-*]_crit_alarm > > +temp[1-*]_emergency_alarm > > Limit alarm > > 0: no alarm > > 1: alarm > > Looks good, I'll merge this into the following patch: > ftp://ftp.kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/hwmon-add-tempx_emergency-attribute-to-sysfs-abi.patch > > as they make more sense together than separated. > Agreed. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
