summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-08-20 22:19:29 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-08-20 22:19:29 (GMT)
commitb8a1171f71c62cdd049fbc452a095173d32ee5fd (patch)
treed0594aef78b69e19dfaa5b92660d9dbb14db73e3
parent2c6625cd545bdd66acff14f3394865d43920a5c7 (diff)
parent7231ed1a813e0a9d249bbbe58e66ca058aee83e1 (diff)
parent62c3f2fddd438d6d8d0a3cbb195637b74c3654eb (diff)
downloadlinux-b8a1171f71c62cdd049fbc452a095173d32ee5fd.tar.xz
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