From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 5 Aug 2014 20:48:56 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle'
X-Git-Tag: v3.17-rc1~99^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=eada238f48309da47535d7de0ab2217f25ebb9c2;p=linux.git

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  cpuidle: Remove time measurement in poll state
  cpuidle: Remove manual selection of the multiple driver support
  cpuidle: ladder governor - use macro instead of hardcoded value
  cpuidle: big_little: Fix build error
  cpuidle: menu governor - remove unused macro STDDEV_THRESH
  cpuidle: fix permission for driver name sysfs node
  cpuidle: move idle traces to cpuidle_enter_state()
---

eada238f48309da47535d7de0ab2217f25ebb9c2