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-Url: https://git.stricted.de/?a=commitdiff_plain;h=132c242d95063f0c362597e74ee6759403a3f700;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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
diff --cc include/acpi/acpi_bus.h
index b43276f339ef,da079976971f,1224be8184fc,8de4fa90e8c4,8de4fa90e8c4..83061cac719b
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@@@@@ -208,10 -208,8 -208,7 -208,7 -208,7 +208,10 @@@@@@ struct acpi_device_flags 
     	u32 visited:1;
     	u32 hotplug_notify:1;
     	u32 is_dock_station:1;
  ---	u32 reserved:23;
  +++	u32 of_compatible_ok:1;
 -   	u32 reserved:22;
 ++++	u32 coherent_dma:1;
 ++++	u32 cca_seen:1;
 ++++	u32 reserved:20;
     };
     
     /* File System */