diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:48:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:48:32 -0700 |
commit | e80bd270ec2838699fd598844fe20d20c2b766dd (patch) | |
tree | af397210439a5eb26604b8affcc4dae54c83bbae /security | |
parent | ccfc27302cdd82529500f3712841f30a62d19aaf (diff) | |
parent | 1102dcab849313bd5a340b299b5cf61b518fbc0f (diff) | |
download | linux-e80bd270ec2838699fd598844fe20d20c2b766dd.tar.bz2 |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Drop some leftover dependencies on CONFIG_EXPERIMENTAL, and add
support for Intel Atom CE4110/4150/4170."
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (coretemp) Add support for Atom CE4110/4150/4170
Documentation/hwmon: remove CONFIG_EXPERIMENTAL
hwmon: (pmbus) remove CONFIG_EXPERIMENTAL
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions