tree 298ebcd418c2cd0a5e37357c3e9718f405f9052b
parent 7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5
parent 632007e2011e5d4269ddb88c0a636b9d9e3c8a13
author Linus Torvalds <torvalds@linux-foundation.org> 1391369457 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1391369457 -0800

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Pull hwmon kconfig fixes from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors
  hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors