From: Linus Torvalds <torvalds@linux-foundation.org> Date: Thu, 17 Sep 2009 16:47:35 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=96c015b75feaaa67c8744229937bd9c35919d16b;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (lm85) Don't bind to Winbond/Nuvoton WPCD377I hwmon: (pcf8591) Documentation clean-ups hwmon: Clearly mark ACPI drivers as such hwmon: Use resource_size hwmon: Include <linux/io.h> instead of <asm/io.h> hwmon: (tmp421) Add documentation hwmon: Add driver for Texas Instruments TMP421/422/423 sensor chips hwmon-vid: Ignore 6th VID pin of AMD family 0Fh processors hwmon: (asus_atk0110) Add maintainer information hwmon: (abituguru3) Support multiple DMI strings per chip ID --- 96c015b75feaaa67c8744229937bd9c35919d16b