linux-imx

Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into next

Conflicts:
	drivers/thermal/cpu_cooling.c