From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 26 Jun 2015 01:30:37 +0000 (+0200)
Subject: Merge branches 'acpi-video', 'device-properties', 'pm-sleep' and 'pm-cpuidle'
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~61^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=132c242d95063f0c362597e74ee6759403a3f700;p=pandora-kernel.git

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
---

132c242d95063f0c362597e74ee6759403a3f700
Reading git-diff-tree failed