tree 75e1c0257e00cf55c1a01ab18fcf7b60c390076e
parent 584d88b2cd3b60507e708d2452651e4d3caa1b81
parent beb70b2d2fe211fc98ec13cf769f331243f5221a
author Zhang Rui <rui.zhang@intel.com> 1376546184 +0800
committer Zhang Rui <rui.zhang@intel.com> 1376546184 +0800

Merge branch 'for_3.12/exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into exynos