diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-20 14:36:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-20 14:36:52 -0400 |
commit | 622f223488517f2b0a5a5e518b2a6c950cf0a2ee (patch) | |
tree | 6ee3fcb99e88c3fc8163561444a888ef842b1da9 /MAINTAINERS | |
parent | 5e427ec2d066b48a5c27b3a5a3315f7e4e729077 (diff) | |
parent | 917cc4e6b25c655264e8ea903eb77db25994ac24 (diff) |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- Error path fixes for abituguru and iio_hwmon drivers.
- Drop erroneously created attributes from nct6775 driver.
- Drop redundant safety on cache lifetime for tmp401 driver.
- Add explicit maintainer for LM95234 and TMP401 drivers.
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
MAINTAINERS: Add myself as maintainer for LM95234 and TMP401 drivers
hwmon: (tmp401) Drop redundant safety on cache lifetime
hwmon: fix error return code in abituguru_probe()
hwmon: (iio_hwmon) Fix null pointer dereference
hwmon: (nct6775) Do not create non-existing attributes
hwmon: (iio_hwmon) Fix missing iio_channel_release_all call if devm_kzalloc fail
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3a7b07f513da..829c0321108b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4976,6 +4976,13 @@ S: Maintained | |||
4976 | F: Documentation/hwmon/lm90 | 4976 | F: Documentation/hwmon/lm90 |
4977 | F: drivers/hwmon/lm90.c | 4977 | F: drivers/hwmon/lm90.c |
4978 | 4978 | ||
4979 | LM95234 HARDWARE MONITOR DRIVER | ||
4980 | M: Guenter Roeck <linux@roeck-us.net> | ||
4981 | L: lm-sensors@lm-sensors.org | ||
4982 | S: Maintained | ||
4983 | F: Documentation/hwmon/lm95234 | ||
4984 | F: drivers/hwmon/lm95234.c | ||
4985 | |||
4979 | LME2510 MEDIA DRIVER | 4986 | LME2510 MEDIA DRIVER |
4980 | M: Malcolm Priestley <tvboxspy@gmail.com> | 4987 | M: Malcolm Priestley <tvboxspy@gmail.com> |
4981 | L: linux-media@vger.kernel.org | 4988 | L: linux-media@vger.kernel.org |
@@ -8182,6 +8189,13 @@ F: drivers/mmc/host/sh_mobile_sdhi.c | |||
8182 | F: include/linux/mmc/tmio.h | 8189 | F: include/linux/mmc/tmio.h |
8183 | F: include/linux/mmc/sh_mobile_sdhi.h | 8190 | F: include/linux/mmc/sh_mobile_sdhi.h |
8184 | 8191 | ||
8192 | TMP401 HARDWARE MONITOR DRIVER | ||
8193 | M: Guenter Roeck <linux@roeck-us.net> | ||
8194 | L: lm-sensors@lm-sensors.org | ||
8195 | S: Maintained | ||
8196 | F: Documentation/hwmon/tmp401 | ||
8197 | F: drivers/hwmon/tmp401.c | ||
8198 | |||
8185 | TMPFS (SHMEM FILESYSTEM) | 8199 | TMPFS (SHMEM FILESYSTEM) |
8186 | M: Hugh Dickins <hughd@google.com> | 8200 | M: Hugh Dickins <hughd@google.com> |
8187 | L: linux-mm@kvack.org | 8201 | L: linux-mm@kvack.org |