From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Feb 2015 19:50:42 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: v4.0-rc1~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f5e25f0db07ee6d083d6376c400ca1065a10fa1a;p=users%2Fjedix%2Flinux-maple.git

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

Pull thermal management fix from Zhang Rui:
 "One patch to fix a problem that all Exynos SoCs will break at boot
  time"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: exynos: fix: Check if data->tmu_read callback is present before read
---

f5e25f0db07ee6d083d6376c400ca1065a10fa1a