commit dbac75468eef385dc8d4bf9927a7547a17edb416
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> Mon Jul 25 13:45:11 2016 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Mon Jul 25 13:45:11 2016 +0200
tree 5a15630edf5a0b9c0a6514c236e52bab861d550a
parent 7f234a4d8aab23e778933808a88bfa47ea4fdc2a
parent 454cbc446fa378ddab3052e0d01aeb4ceb8304e2

Merge branch 'pm-devfreq'

* pm-devfreq:
  PM / devfreq: exynos-bus: add missing of_node_put after calling of_parse_phandle
  PM / devfreq: add missing of_node_put after calling of_parse_phandle
  PM / devfreq: exynos-ppmu: fix error path in exynos_ppmu_probe()
  PM / devfreq: exynos: fix error path in exynos_bus_probe()
  PM / devfreq: make event/exynos-ppmu DEVFREQ_EVENT_EXYNOS_PPMU tristate
  PM / devfreq: make event/exynos-nocp DEVFREQ_EVENT_EXYNOS_NOCP tristate
  PM / devfreq: make exynos-bus ARM_EXYNOS_BUS_DEVFREQ tristate
  PM / devfreq: make devfreq-event explicitly non-modular
  PM / devfreq: make devfreq explicitly non-modular