From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 14 Jan 2016 22:22:56 +0000 (+0100)
Subject: Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx... 
X-Git-Tag: v4.5-rc1~37^2~2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=250dfa05e5be98d7c8f246181da51165f83bbe62;p=linux.git

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

Pull devfreq changes for v4.5 from MyungJoo Ham.

* 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  MAINTAINERS: Add devfreq-event entry
  MAINTAINERS: Add missing git repository and directory for devfreq
  PM / devfreq: Do not show statistics if it's not ready.
  PM / devfreq: Modify the indentation of trans_stat sysfs for readability
  PM / devfreq: Set the freq_table of devfreq device
  PM / devfreq: Add show_one macro to delete the duplicate code
  PM / devfreq: event: Fix the error and warning from script/checkpatch.pl
  PM / devfreq: event: Remove the error log of devfreq_event_get_edev_by_phandle()
---

250dfa05e5be98d7c8f246181da51165f83bbe62