From: Zhang Rui Date: Tue, 9 Dec 2014 03:37:35 +0000 (+0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux... X-Git-Tag: firefly_0821_release~176^2~2645^2^2^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9c1e4550b5cbe17ff68ce631356190ef9a565386;p=firefly-linux-kernel-4.4.55.git Merge branch 'linus' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into eduardo-soc-thermal --- 9c1e4550b5cbe17ff68ce631356190ef9a565386