From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 18 Mar 2019 14:37:44 +0000 (+0800)
Subject: Merge branches 'fixes' and 'thermal-intel' into next
X-Git-Tag: v5.1-rc2~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d7c4e17811f766321b9c054609551fa40f0b445;p=thirdparty%2Flinux.git

Merge branches 'fixes' and 'thermal-intel' into next
---

2d7c4e17811f766321b9c054609551fa40f0b445