Fix conflict with thermal patches added in c03d4317a6. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
c03d4317a6