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)
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


Trivial merge