summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 16:35:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 16:35:10 -0800
commit16cd9d1c0f149ee0c8073de037e7c57886234aa0 (patch)
tree8d9f08b1043b3e08eefbe46ceea7a5ea56380335 /MAINTAINERS
parentf412f2c60b480fa5140a4b4cb321cd48c64e1812 (diff)
parentaae7bce48176d5ffa4ccd4dbdb861488db892837 (diff)
downloadlinux-16cd9d1c0f149ee0c8073de037e7c57886234aa0.tar.gz
linux-16cd9d1c0f149ee0c8073de037e7c57886234aa0.tar.bz2
linux-16cd9d1c0f149ee0c8073de037e7c57886234aa0.zip
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon fixes and updates from Jean Delvare: "All lm90 driver fixes and improvements" * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: Documentation: dt: hwmon: Add OF document for LM90 hwmon: (lm90) Add power control hwmon: (lm90) Add support for TI TMP451 hwmon: (lm90) Use enums for the indexes of temp8 and temp11 hwmon: (lm90) Add support to handle IRQ hwmon: (lm90) Define status bits hwmon: (lm90) Fix max6696 alarm handling
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index affd429843e4..aef332323256 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5215,6 +5215,7 @@ M: Jean Delvare <khali@linux-fr.org>
L: lm-sensors@lm-sensors.org
S: Maintained
F: Documentation/hwmon/lm90
+F: Documentation/devicetree/bindings/hwmon/lm90.txt
F: drivers/hwmon/lm90.c
LM95234 HARDWARE MONITOR DRIVER