From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Nov 2012 22:25:14 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=225ff868e1eeddcda06e06854e6292b1f8bb2edb;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'release' of git://git./linux/kernel/git/rzhang/linux

Pull thermal management & ACPI update from Zhang Rui,

Ho humm.  Normally these things go through Len.  But it's just three
small fixes, I guess I can pull directly too.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.
  ACPI video: Ignore errors after _DOD evaluation.
  thermal: solve compilation errors in rcar_thermal
---

225ff868e1eeddcda06e06854e6292b1f8bb2edb