diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 19:38:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 19:38:14 -0400 |
| commit | 4cce593f1b94274526167709dc25a66e6f1f5af0 (patch) | |
| tree | ea3c61c03a350149bca64bd23a54d1f95ba03579 | |
| parent | 1113cdfe7d2c1fe08b64caa3affe19260e66dd95 (diff) | |
| parent | a94ef4ed710e0864c9720ff3f30ceb051aeb8377 (diff) | |
Merge tag 'hwmon-for-linus-v4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixlet from Guenter Roeck:
"Update location of Jean Delvare's hwmon quilt tree"
* tag 'hwmon-for-linus-v4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: Update the location of my quilt tree
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f8e0afb708b4..60d24f224271 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4536,7 +4536,7 @@ M: Jean Delvare <jdelvare@suse.de> | |||
| 4536 | M: Guenter Roeck <linux@roeck-us.net> | 4536 | M: Guenter Roeck <linux@roeck-us.net> |
| 4537 | L: lm-sensors@lm-sensors.org | 4537 | L: lm-sensors@lm-sensors.org |
| 4538 | W: http://www.lm-sensors.org/ | 4538 | W: http://www.lm-sensors.org/ |
| 4539 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ | 4539 | T: quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ |
| 4540 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git | 4540 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git |
| 4541 | S: Maintained | 4541 | S: Maintained |
| 4542 | F: Documentation/hwmon/ | 4542 | F: Documentation/hwmon/ |