Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Tue, 19 May 2015 00:12:27 +0000 (08:12 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 19 May 2015 00:12:27 +0000 (08:12 +0800)
commitb1932ce4c1747fe974912d05f3d3ddbad440eaec
treef1e8c9c9a35c0af1a566e2e673c31abc04b1a35e
parent459ce5742371391c62dbab6c7c9603c8f569a30a
parentae776069cd0cf3a44459b1f7598a2e1396b9cb62
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into for-rc