Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next (98d94507) · Commits · Linaro / qcomlt / kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kernel
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

98d94507

Commit 98d94507 authored 9 years ago by Zhang Rui

Downloads
- Plain Diff

Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next

parents 20bbfaf7 4511f716 ad74e46c

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/thermal/rockchip-thermal.txt 2 additions, 0 deletions

...entation/devicetree/bindings/thermal/rockchip-thermal.txt
drivers/thermal/rcar_thermal.c 33 additions, 20 deletions

drivers/thermal/rcar_thermal.c
drivers/thermal/rockchip_thermal.c 160 additions, 12 deletions

drivers/thermal/rockchip_thermal.c
drivers/thermal/step_wise.c 15 additions, 2 deletions

drivers/thermal/step_wise.c
drivers/thermal/thermal_core.c 77 additions, 4 deletions

drivers/thermal/thermal_core.c
drivers/thermal/thermal_core.h 1 addition, 0 deletions

drivers/thermal/thermal_core.h
include/linux/thermal.h 5 additions, 0 deletions

include/linux/thermal.h

with 293 additions and 38 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment