From: Zhang Rui <rui.zhang@intel.com>
Date: Thu, 2 Nov 2017 08:31:52 +0000 (+0800)
Subject: Merge branch 'imx-nvmem' into thermal-soc
X-Git-Tag: v4.15-rc1~57^2^4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe9ba5bc73af01f7d53bb6b2b31204f799dd09be;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'imx-nvmem' into thermal-soc
---

fe9ba5bc73af01f7d53bb6b2b31204f799dd09be