Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2015 00:42:54 +0000 (17:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2015 00:42:54 +0000 (17:42 -0700)
commit18658921a2b5e445fef2450420ba7564e8fa3912
treeaae8e261e5e0c629c27ba12585d4cdb00d38a01b
parent83ee4121b18e912cd54800a83728b13c554fbc53
parente93cd95029c3b8aa628f0204e80e66fc61b57f12
Merge branch 'for-rc' of git://git./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