From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 17 Jun 2013 22:31:26 +0000 (+0800)
Subject: Merge branch 'cpu-package-thermal' of .git into next
X-Git-Tag: v3.11-rc1~27^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f157f5964bdc604d8cbf0b71780a0d47ea9f7371;p=pandora-kernel.git

Merge branch 'cpu-package-thermal' of .git into next

Conflicts:
	drivers/thermal/Kconfig
	drivers/thermal/Makefile
---

f157f5964bdc604d8cbf0b71780a0d47ea9f7371
Reading git-diff-tree failed