diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 20:48:32 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 20:48:32 +0200 |
commit | e80bd270ec2838699fd598844fe20d20c2b766dd (patch) | |
tree | af397210439a5eb26604b8affcc4dae54c83bbae /arch/parisc/include/asm/pdc.h | |
parent | Merge tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
parent | hwmon: (coretemp) Add support for Atom CE4110/4150/4170 (diff) | |
download | linux-e80bd270ec2838699fd598844fe20d20c2b766dd.tar.xz linux-e80bd270ec2838699fd598844fe20d20c2b766dd.zip |
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 'arch/parisc/include/asm/pdc.h')
0 files changed, 0 insertions, 0 deletions