Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Wed, 14 Jan 2015 07:49:19 +0000 (15:49 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 14 Jan 2015 07:49:19 +0000 (15:49 +0800)
commita4378cc66d9c772dc37d32d434b14c7545e6fc21
tree71c3f71c7f11376476ccea7848019f9d890de418
parent693a30b8f19a964087a3762d09fb2e1cbad6b0d4
parentee853addd9fedb116bd34a18f11dd5959fcf0428
Merge branch 'fixes' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc