diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-10 03:08:58 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-10 03:08:58 +0100 |
commit | 13de22c59fd1f5a452fea806a5f822883deec88b (patch) | |
tree | 9642d3d152fef4cf61b04a941c31b9c9e5226f81 /sound | |
parent | Merge branches 'acpi-battery' and 'pm-cpufreq' (diff) | |
parent | intel_idle: close avn_cstates array with correct marker (diff) | |
download | linux-13de22c59fd1f5a452fea806a5f822883deec88b.tar.xz linux-13de22c59fd1f5a452fea806a5f822883deec88b.zip |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
intel_idle: close avn_cstates array with correct marker
Revert "intel_idle: mark states tables with __initdata tag"
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions