diff options
| author | Linus Torvalds | 2015-01-15 19:20:26 +1300 |
|---|---|---|
| committer | Linus Torvalds | 2015-01-15 19:20:26 +1300 |
| commit | f800c25b7a762d445ba1439a2428c8362157eba6 (patch) | |
| tree | 114f92970cc1701914b7fa1d70c597fa5661c811 /fs/reiserfs/xattr_user.c | |
| parent | a6391a924cf5a16761ccd6b45094a7d5b9aeebac (diff) | |
| parent | a4378cc66d9c772dc37d32d434b14c7545e6fc21 (diff) | |
Merge branch 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fixes from Zhang Rui:
"Specifics:
- bogus type qualifier fix in OF thermal code.
- Minor fixes on imx and rcar thermal drivers.
- Update TI SoC thermal maintainer entry.
- Updated documentation of OF cpufreq cooling register"
* 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: rcar: Spelling/grammar: s/drier use .../driver uses ...s/
thermal: rcar: change type of ctemp in rcar_thermal_update_temp()
thermal: rcar: fix ENR register value
Documentation: thermal: document of_cpufreq_cooling_register()
Thermal: imx: add clk disable/enable for suspend/resume
MAINTAINERS: update ti-soc-thermal status
MAINTAINERS: Add linux-omap to list of reviewers for TI Thermal
thermal: of: Remove bogus type qualifier for of_thermal_get_trip_points()
Diffstat (limited to 'fs/reiserfs/xattr_user.c')
0 files changed, 0 insertions, 0 deletions