From: Zhang Rui Date: Wed, 2 Sep 2015 02:08:02 +0000 (+0800) Subject: Merge branches 'thermal-core' and 'thermal-intel' of .git into next X-Git-Tag: omap-for-v4.3/fixes-rc1~28^2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a924a07f882e866f2337bf65048be357956691a;p=pandora-kernel.git Merge branches 'thermal-core' and 'thermal-intel' of .git into next --- 5a924a07f882e866f2337bf65048be357956691a Reading git-diff-tree failed