Merge branch 'fixes-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 6 Jul 2016 19:57:46 +0000 (21:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 6 Jul 2016 19:57:46 +0000 (21:57 +0200)
commit454cbc446fa378ddab3052e0d01aeb4ceb8304e2
tree16277539128c21320d65093fbf3e5fc55657e4c6
parenta99cde438de0c4c0cecc1d1af1a55a75b10bfdef
parentd8150d14e9bc44ba55c707cc67f4fa66d65cfdef
Merge branch 'fixes-2' of https://git./linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq fixes from MyungJoo Ham.

* 'fixes-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/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