Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Mon, 14 Mar 2016 23:53:01 +0000 (07:53 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 14 Mar 2016 23:53:01 +0000 (07:53 +0800)
commit032f4a1e5a307c63b5ac27298ea82eb328f40ccc
tree3ba2d301d6408c6d3b11439076464f25c24b8cd5
parentccb361d2fdda8975c8bbc8a1749c31dbd62dd276
parent61f846f37354fd294f3172845d9fec2c03f60a45
Merge branch 'linus' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
drivers/thermal/Kconfig