From: Linus Torvalds Date: Fri, 22 May 2015 00:42:54 +0000 (-0700) Subject: Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=18658921a2b5e445fef2450420ba7564e8fa3912;p=linux-beck.git Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux Pull thermal fixes from Zhang Rui: "Three fixes for Armada (380) and TI (dra7 and OMAP5) thermal soc drivers" * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: armada: Update Armada 380 thermal sensor coefficients thermal: ti-soc-thermal: OMAP5: Implement Workaround for Errata i813 thermal: ti-soc-thermal: dra7: Implement Workaround for Errata i814 --- 18658921a2b5e445fef2450420ba7564e8fa3912