Merge branch 'thermal-core-fix' of .git into next
authorZhang Rui <[email protected]>
Sat, 11 Oct 2014 01:28:13 +0000 (09:28 +0800)
committerZhang Rui <[email protected]>
Sat, 11 Oct 2014 01:28:13 +0000 (09:28 +0800)
1  2 
drivers/thermal/step_wise.c

Simple merge