From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 20 Aug 2015 22:19:29 +0000 (+0200)
Subject: Merge branches 'acpi-video' and 'cpufreq-fixes'
X-Git-Tag: v5.15~15257^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b8a1171f71c62cdd049fbc452a095173d32ee5fd;p=mirror_ubuntu-kernels.git

Merge branches 'acpi-video' and 'cpufreq-fixes'

* acpi-video:
  ACPI / video: Fix circular lock dependency issue in the video-detect code

* cpufreq-fixes:
  cpufreq: exynos: Fix for memory leak in case SoC name does not match
---

b8a1171f71c62cdd049fbc452a095173d32ee5fd