Commit 4cce593f authored May 21, 2015 by Linus Torvalds

Merge tag 'hwmon-for-linus-v4.1-rc5' of...

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

parents 1113cdfe a94ef4ed

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -4536,7 +4536,7 @@ M: Jean Delvare <jdelvare@suse.de>
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		W: http://www.lm-sensors.org/
		T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
		T: quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
		S: Maintained
		F: Documentation/hwmon/