]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
1  2 
drivers/thermal/imx_thermal.c

Simple merge