Merge branch 'imx-nvmem' into thermal-soc
authorZhang Rui <rui.zhang@intel.com>
Thu, 2 Nov 2017 08:31:52 +0000 (16:31 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 2 Nov 2017 08:31:52 +0000 (16:31 +0800)
1  2 
drivers/thermal/Kconfig

Simple merge