Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
Conflicts: drivers/staging/omap-thermal/omap-thermal-common. OMAP supplied dummy TC1 and TC2, at the same time that the thermal tree removed them from thermal_zone_device_register() drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c propogate the upstream MAX_IDR_LEVEL re-name to prevent a build failure Previously-fixed-by: NStephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: NLen Brown <len.brown@intel.com>
Showing
drivers/hwmon/exynos4_tmu.c
已删除
100644 → 0
drivers/thermal/cpu_cooling.c
0 → 100644
drivers/thermal/exynos_thermal.c
0 → 100644
此差异已折叠。
drivers/thermal/rcar_thermal.c
0 → 100644
include/linux/cpu_cooling.h
0 → 100644
想要评论请 注册 或 登录