]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 14 Sep 2015 23:29:43 +0000 (01:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 14 Sep 2015 23:29:43 +0000 (01:29 +0200)
Pull devfreq updates for v4.3 from MyungJoo Ham.

* 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: Fix incorrect type issue.
  PM / devfreq: tegra: Update governor to use devfreq_update_stats()
  PM / devfreq: comments for get_dev_status usage updated
  PM / devfreq: drop comment about thermal setting max_freq
  PM / devfreq: cache the last call to get_dev_status()
  PM / devfreq: Drop unlikely before IS_ERR(_OR_NULL)
  PM / devfreq: exynos-ppmu: bit-wise operation bugfix.
  PM / devfreq: exynos-ppmu: Update documentation to support PPMUv2
  PM / devfreq: exynos-ppmu: Add the support of PPMUv2 for Exynos5433
  PM / devfreq: event: Remove incorrect property in exynos-ppmu DT binding

Conflicts:
drivers/devfreq/event/exynos-ppmu.c


Trivial merge