projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c426dfc b83e2d9 b5f17ca 7da7e06 fc546e2)
Merge branches 'acpi-video', 'device-properties', 'pm-sleep' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Jun 2015 01:30:37 +0000 (03:30 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Jun 2015 01:30:37 +0000 (03:30 +0200)
commit7c1495c7f71ee5b2937bd2e06a64cc5a35b256fc
treef1e97a237d8efaa7adeb41a8b487cb6d17745711tree | snapshot
parentc426dfcaf1b3602e34a28c2f2cf14e23f71f4d8fcommit | diff
parentb83e2d96913692ac35396b27623d50662d18c3c9commit | diff
parentb5f17cabc1bf27f5a6c314dedc7f78b4bacb8236commit | diff
parent7da7e06cfe2ee735c21b925216a48dbcd271c956commit | diff
parentfc546e27a8cf756a0656eeaef50e7ea4764dcaefcommit | diff
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
drivers/base/property.c diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
drivers/gpio/gpiolib.c diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
include/acpi/acpi_bus.h diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
include/linux/acpi.h diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
Linux Kernel Source Tree.