diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-02 11:30:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-02 11:30:57 -0800 |
commit | 602456bf169926d331246de9cc5593b962cea0dc (patch) | |
tree | 298ebcd418c2cd0a5e37357c3e9718f405f9052b /fs | |
parent | 7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5 (diff) | |
parent | 632007e2011e5d4269ddb88c0a636b9d9e3c8a13 (diff) | |
download | linux-602456bf169926d331246de9cc5593b962cea0dc.tar.gz linux-602456bf169926d331246de9cc5593b962cea0dc.tar.bz2 linux-602456bf169926d331246de9cc5593b962cea0dc.zip |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions