tree f1e97a237d8efaa7adeb41a8b487cb6d17745711
parent 11f68686065a5634b09b374e988eb82c83a34d24
parent eddda195dd9272224a8e6112881829ed74ffef5b
parent c181fb3e723351e2f7a1f76b6c0627a4b8ad1723
parent fff3b16d2754a061a3549c4307a186423a0128fd
parent cc5a2f7b8f39e7db559778f7913a2410257b3e50
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1435282237 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1435282237 +0200

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