diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-26 13:35:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-26 13:35:43 -0700 |
| commit | ef82bdc57a204bf452da9f7c273c21462f17344e (patch) | |
| tree | a4e53f30c976a0c7cf224ec5114a210eec177b41 /init | |
| parent | 231e58e7d9494bddbd05479f9f50ed0be66794d7 (diff) | |
| parent | 2f1c3db0a6adcfd12d556afa3605d4923658b307 (diff) | |
Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
* 'hwmon-for-linus' of git://github.com/groeck/linux:
hwmon: (coretemp) remove struct platform_data * parameter from create_core_data()
hwmon: (coretemp) constify static data
hwmon: (coretemp) don't use kernel assigned CPU number as platform device ID
hwmon: (ds620) Fix handling of negative temperatures
hwmon: (w83791d) rename prototype parameter from 'register' to 'reg'
hwmon: (coretemp) Don't use threshold registers for tempX_max
hwmon: (coretemp) Let the user force TjMax
hwmon: (coretemp) Drop duplicate function get_pkg_tjmax
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions