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

diff --cc drivers/base/property.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc include/acpi/acpi_bus.h
index b43276f339efd0114400ab6396ba7efd651a44c3,da079976971fe1afd234cec0cad2b4e231f40b05,1224be8184fce545a198f16d1a6be7202e49d671,8de4fa90e8c4add33967c8dbec6b7cfe2d01b2c4,8de4fa90e8c4add33967c8dbec6b7cfe2d01b2c4..83061cac719bce830608daac2ed45e1760f5bd76
--- 1/include/acpi/acpi_bus.h
--- 2/include/acpi/acpi_bus.h
--- 3/include/acpi/acpi_bus.h
--- 4/include/acpi/acpi_bus.h
--- 5/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 */

diff --cc include/linux/acpi.h
Simple merge