Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Dec 2013 19:05:19 +0000 (11:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Dec 2013 19:05:19 +0000 (11:05 -0800)
commit86b581f6f18e5cfe420e94ce72e8a44d05cc23b1
tree91856f7973addbf1d559fd71b859b755d8038f82
parentc8469441c4415b9738327f64c74a5b76bf465815
parentefabcc2123f0ed47870033b8d6fc73b50d76d635
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix HIH-6130 driver to work with BeagleBone"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK