Merge branch 'exynos-fix' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 24 Apr 2013 16:04:06 +0000 (00:04 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 24 Apr 2013 16:04:06 +0000 (00:04 +0800)
1  2 
drivers/thermal/exynos_thermal.c

Simple merge