diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-21 00:19:29 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-21 00:19:29 +0200 |
| commit | b8a1171f71c62cdd049fbc452a095173d32ee5fd (patch) | |
| tree | d0594aef78b69e19dfaa5b92660d9dbb14db73e3 | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
| parent | 7231ed1a813e0a9d249bbbe58e66ca058aee83e1 (diff) | |
| parent | 62c3f2fddd438d6d8d0a3cbb195637b74c3654eb (diff) | |
| download | linux-b8a1171f71c62cdd049fbc452a095173d32ee5fd.tar.bz2 | |
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