projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 11f6868 eddda19 c181fb3 fff3b16 cc5a2f7)
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)
commit132c242d95063f0c362597e74ee6759403a3f700
treef1e97a237d8efaa7adeb41a8b487cb6d17745711tree | snapshot
parent11f68686065a5634b09b374e988eb82c83a34d24commit | diff
parenteddda195dd9272224a8e6112881829ed74ffef5bcommit | diff
parentc181fb3e723351e2f7a1f76b6c0627a4b8ad1723commit | diff
parentfff3b16d2754a061a3549c4307a186423a0128fdcommit | diff
parentcc5a2f7b8f39e7db559778f7913a2410257b3e50commit | 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
Unnamed repository; edit this file 'description' to name the repository.