Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: Add Asus ATK0110 support hwmon: (lm95241) Convert to new-style i2c driver
Showing
- drivers/acpi/acpica/nsxfeval.c 1 addition, 2 deletionsdrivers/acpi/acpica/nsxfeval.c
- drivers/hwmon/Kconfig 12 additions, 0 deletionsdrivers/hwmon/Kconfig
- drivers/hwmon/Makefile 1 addition, 0 deletionsdrivers/hwmon/Makefile
- drivers/hwmon/asus_atk0110.c 1009 additions, 0 deletionsdrivers/hwmon/asus_atk0110.c
- drivers/hwmon/lm95241.c 47 additions, 65 deletionsdrivers/hwmon/lm95241.c
- include/acpi/acpixf.h 0 additions, 2 deletionsinclude/acpi/acpixf.h
Loading
Please register or sign in to comment