Merge branch 'misc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 6 Jan 2014 14:48:19 +0000 (22:48 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 6 Jan 2014 14:48:19 +0000 (22:48 +0800)
commitc698a4492f01127ca90fc28cd5157f3d616fe4ff
treef619e145e937607ebee0b97bf51a6a55ad8207b8
parent8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22
parentcbb07bb35de6ebaeea27f64860bc6277a13d5b41
Merge branch 'misc' of .git into next
drivers/thermal/imx_thermal.c