diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 07:32:00 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 07:32:00 +0400 |
| commit | 1aad08dc571604ebe473e2a187f0f7b211ae6c3f (patch) | |
| tree | 6d95d35c187a4d1ccf07d620d6c84df567cd4df0 /include/uapi/linux/resource.h | |
| parent | 27a24cfa04c6f041c0191847d047f25e5627cd63 (diff) | |
| parent | 5a2bff8d7c7f63e2e8d467f66f6492fbb4d9509c (diff) | |
| download | linux-1aad08dc571604ebe473e2a187f0f7b211ae6c3f.tar.xz | |
Merge tag 'pm+acpi-3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki:
- Additional CPU ID for the intel_pstate driver from Dirk Brandewie.
- More cpufreq fixes related to ARM big.LITTLE support and locking from
Viresh Kumar.
- VIA C7 cpufreq build fix from Rafał Bilski.
- ACPI power management fix making it possible to use device power
states regardless of the CONFIG_PM setting from Rafael J Wysocki.
- New ACPI video blacklist item from Bastian Triller.
* tag 'pm+acpi-3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist
cpufreq: arm_big_little_dt: Instantiate as platform_driver
cpufreq: arm_big_little_dt: Register driver only if DT has valid data
cpufreq / e_powersaver: Fix linker error when ACPI processor is a module
cpufreq / intel_pstate: Add additional supported CPU ID
cpufreq: Drop rwsem lock around CPUFREQ_GOV_POLICY_EXIT
ACPI / PM: Allow device power states to be used for CONFIG_PM unset
Diffstat (limited to 'include/uapi/linux/resource.h')
0 files changed, 0 insertions, 0 deletions