]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commit
thermal: Fix merge error in Kconfig
authorBo Yan <byan@nvidia.com>
Sat, 29 Jun 2013 18:57:56 +0000 (11:57 -0700)
committerSrikar Srimath Tirumala <srikars@nvidia.com>
Fri, 6 May 2016 22:03:31 +0000 (15:03 -0700)
commitebf127f7b0b21e5e315053c2d6f1fabbda374ee1
tree663401411cfb09f938b28453ca3dbf855a4522a1
parentff517b3b0e8989c4f5d3a49b4bc978607c81581a
thermal: Fix merge error in Kconfig

Remove redundant entries
Add name for PID thermal governor

Change-Id: I90d4e9f4aa8a5690250dc5231ad1e98355f9bb82
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/243691
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
include/linux/thermal.h