diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-26 03:30:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-26 03:30:37 +0200 |
| commit | 132c242d95063f0c362597e74ee6759403a3f700 (patch) | |
| tree | f1e97a237d8efaa7adeb41a8b487cb6d17745711 /crypto/algif_skcipher.c | |
| parent | Merge branch 'acpi-pnp' (diff) | |
| parent | ACPI / video: Inline acpi_video_set_dmi_backlight_type (diff) | |
| parent | ACPI / OF: Rename of_node() and acpi_node() to to_of_node() and to_acpi_node() (diff) | |
| parent | PM / sleep: Increase default DPM watchdog timeout to 60 (diff) | |
| parent | tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP s... (diff) | |
| download | linux-132c242d95063f0c362597e74ee6759403a3f700.tar.xz linux-132c242d95063f0c362597e74ee6759403a3f700.zip | |
Merge branches 'acpi-video', 'device-properties', 'pm-sleep' and 'pm-cpuidle'
* acpi-video:
ACPI / video: Inline acpi_video_set_dmi_backlight_type
* device-properties:
ACPI / OF: Rename of_node() and acpi_node() to to_of_node() and to_acpi_node()
* pm-sleep:
PM / sleep: Increase default DPM watchdog timeout to 60
PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
* pm-cpuidle:
tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP set in periodic mode