Merge branches 'pm-devfreq' and 'pm-domains'

* pm-devfreq:
  PM / devfreq: add tracing for scheduling work
  trace: events: add devfreq trace event file
  PM / devfreq: rk3399_dmc: Pass ODT and auto power down parameters to TF-A.
  PM / devfreq: rockchip-dfi: Move GRF definitions to a common place.
  PM / devfreq: exynos-bus: Suspend all devices on system shutdown
  PM / devfreq: Fix static checker warning in try_then_request_governor
  PM / devfreq: Restart previous governor if new governor fails to start
  PM / devfreq: tegra: remove unneeded variable
  PM / devfreq: rockchip-dfi: remove unneeded semicolon
  PM / devfreq: rk3399_dmc: remove unneeded semicolon
  PM / devfreq: consistent indentation
  PM / devfreq: fix missing check of return value in devfreq_add_device()
  PM / devfreq: fix mem leak in devfreq_add_device()
  PM / devfreq: Use of_node_name_eq for node name comparisons

* pm-domains:
  PM / Domains: Allow to attach a CPU via genpd_dev_pm_attach_by_id|name()
  PM / Domains: Search for the CPU device outside the genpd lock
  PM / Domains: Drop unused in-parameter to some genpd functions
  PM / Domains: Use the base device for driver_deferred_probe_check_state()
  PM / Domains: Enable genpd_dev_pm_attach_by_id|name() for single PM domain
  PM / Domains: Allow OF lookup for multi PM domain case from ->attach_dev()
  PM / Domains: Don't kfree() the virtual device in the error path
  PM / Domains: remove unnecessary unlikely()

diff --combined MAINTAINERS
index 9a1d42e652da15ab36e39176769eb813245d68b2,27ed10966c8175a1ac677cdc08ee3f4166002ea4,3671fdea5010e351ff5cedabde6dee83a8db9d7c..dbb490f2b0a054ac6f332c2d4eb16cd500fa76bb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -3121,7 -3121,6 -3121,6 +3121,7 @@@@ F:    drivers/cpufreq/bmips-cpufreq.
   BROADCOM BMIPS MIPS ARCHITECTURE
   M:   Kevin Cernekee <cernekee@gmail.com>
   M:   Florian Fainelli <f.fainelli@gmail.com>
 ++L:   bcm-kernel-feedback-list@broadcom.com
   L:   linux-mips@vger.kernel.org
   T:   git git://github.com/broadcom/stblinux.git
   S:   Maintained
@@@@ -4553,6 -4552,7 -4552,6 +4553,7 @@@@ S:    Maintaine
   F:   drivers/devfreq/
   F:   include/linux/devfreq.h
   F:   Documentation/devicetree/bindings/devfreq/
+ +F:   include/trace/events/devfreq.h
   
   DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
   M:   Chanwoo Choi <cw00.choi@samsung.com>
@@@@ -7334,6 -7334,7 -7333,7 +7335,6 @@@@ F:    Documentation/devicetree/bindings/i3
   F:   Documentation/driver-api/i3c
   F:   drivers/i3c/
   F:   include/linux/i3c/
 --F:   include/dt-bindings/i3c/
   
   I3C DRIVER FOR SYNOPSYS DESIGNWARE
   M:   Vitor Soares <vitor.soares@synopsys.com>
@@@@ -8708,7 -8709,6 -8708,6 +8709,7 @@@@ F:    scripts/leaking_addresses.p
   LED SUBSYSTEM
   M:   Jacek Anaszewski <jacek.anaszewski@gmail.com>
   M:   Pavel Machek <pavel@ucw.cz>
 ++R:   Dan Murphy <dmurphy@ti.com>
   L:   linux-leds@vger.kernel.org
   T:   git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
   S:   Maintained
@@@@ -10146,7 -10146,7 -10145,7 +10147,7 @@@@ F:        drivers/spi/spi-at91-usart.
   F:   Documentation/devicetree/bindings/mfd/atmel-usart.txt
   
   MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 --M:   Woojung Huh <Woojung.Huh@microchip.com>
 ++M:   Woojung Huh <woojung.huh@microchip.com>
   M:   Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
   L:   netdev@vger.kernel.org
   S:   Maintained
@@@@ -12416,7 -12416,7 -12415,7 +12417,7 @@@@ M:        Mark Rutland <mark.rutland@arm.com
   M:   Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
   L:   linux-arm-kernel@lists.infradead.org
   S:   Maintained
 --F:   drivers/firmware/psci*.c
 ++F:   drivers/firmware/psci/
   F:   include/linux/psci.h
   F:   include/uapi/linux/psci.h