| commit | 18658921a2b5e445fef2450420ba7564e8fa3912 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 21 17:42:54 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 21 17:42:54 2015 -0700 |
| tree | aae8e261e5e0c629c27ba12585d4cdb00d38a01b | |
| parent | 83ee4121b18e912cd54800a83728b13c554fbc53 [diff] | |
| parent | e93cd95029c3b8aa628f0204e80e66fc61b57f12 [diff] |
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