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)
commitfe9ba5bc73af01f7d53bb6b2b31204f799dd09be
treead68935d28d4616eefdefb95b4e10d3d85f11b29
parentb2fd708ffa7f43ce8680271924e1771e26a3ec91
parent531fcdeb71f0be1d4c77838b1a4694c317b1eb98
Merge branch 'imx-nvmem' into thermal-soc
drivers/thermal/Kconfig