From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 15 Apr 2013 01:26:58 +0000 (+0800)
Subject: Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux... 
X-Git-Tag: v3.10-rc1~42^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d13cb03aef0c062dcdd16b411bd4c02c1574ff08;p=pandora-kernel.git

Merge branch 'thermal' of git://git./linux/kernel/git/rzhang/linux into next

Conflicts:
	drivers/thermal/cpu_cooling.c
---

d13cb03aef0c062dcdd16b411bd4c02c1574ff08
Reading git-diff-tree failed