diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 09:23:43 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 09:23:43 -0700 | 
| commit | bfb764440d5bee109003295473a0b387bc799222 (patch) | |
| tree | 23f4683f6aca3b75d81e009f1c8f9b201a6422c1 /net/lapb/lapb_subr.c | |
| parent | 159d08f4b85ce454cd05fb9e2c539276e148d366 (diff) | |
| parent | 88ac99063e6e38bf9577e75f0d65dd02e2326d58 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management updates from Zhang Rui:
 - Introduce generic ADC thermal driver, based on OF thermal (Laxman
   Dewangan)
 - Introduce new thermal driver for Tango chips (Marc Gonzalez)
 - Rockchip driver support for RK3399, RK3366, and some fixes (Caesar
   Wang, Elaine Zhang and Shawn Lin)
 - Add CPU power cooling model to Mediatek thermal driver (Dawei Chien)
 - Wider usage of dev_thermal_zone_of_sensor_register (Eduardo Valentin)
 - TI thermal driver gained a new maintainer (Keerthy).
 - Enabled powerclamp driver by checking CPU feature and package cstate
   counter instead of CPU whitelist (Jacob Pan)
 - Various fixes on thermal governor, OF thermal, Tegra, and RCAR
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (50 commits)
  thermal: tango: initialize TEMPSI_CFG
  thermal: rockchip: use the usleep_range instead of udelay
  thermal: rockchip: add the notes for better reading
  thermal: rockchip: Support RK3366 SoCs in the thermal driver
  thermal: rockchip: handle the power sequence for tsadc controller
  thermal: rockchip: update the tsadc table for rk3399
  thermal: rockchip: fixes the code_to_temp for tsadc driver
  thermal: rockchip: disable thermal->clk in err case
  thermal: tegra: add Tegra132 specific SOC_THERM driver
  thermal: fix ptr_ret.cocci warnings
  thermal: mediatek: Add cpu dynamic power cooling model.
  thermal: generic-adc: Add ADC based thermal sensor driver
  thermal: generic-adc: Add DT binding for ADC based thermal sensor
  thermal: tegra: fix static checker warning
  thermal: tegra: mark PM functions __maybe_unused
  thermal: add temperature sensor support for tango SoC
  thermal: hisilicon: fix IRQ imbalance enabling
  thermal: hisilicon: support to use any sensor
  thermal: rcar: Remove binding docs for r8a7794
  thermal: tegra: add PM support
  ...
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions
