From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Feb 2014 19:30:57 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: accepted/tizen/common/20141203.182822~629
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=602456bf169926d331246de9cc5593b962cea0dc;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'hwmon-for-linus' of git://git./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
---

602456bf169926d331246de9cc5593b962cea0dc