From: Linus Torvalds Date: Sat, 6 Feb 2010 21:02:31 +0000 (-0800) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Tag: v2.6.33-rc7~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=82e22d77bfb2523284fdf5c484c1fa5269a5d27e;p=~shefty%2Frdma-dev.git Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (w83781d) Request I/O ports individually for probing hwmon: (lm78) Request I/O ports individually for probing hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT --- 82e22d77bfb2523284fdf5c484c1fa5269a5d27e