From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 14 Sep 2015 23:29:43 +0000 (+0200)
Subject: Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx... 
X-Git-Tag: v4.3-rc2~3^2~1^3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4184a8fc57a43faa2625988cc87031db77af9d98;p=users%2Fwilly%2Fxarray.git

Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

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
---

4184a8fc57a43faa2625988cc87031db77af9d98