tree a7552f1e89ae6afb3ebb7051bbac86452a8684f0
parent 92266e1de4324a23359fe71678cb521987fea0c5
parent 84599238ea78d98136fc6f6239a14083128ecf8b
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1452557463 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1452557463 +0100

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  drivers/cpuidle: make cpuidle-exynos.c explicitly non-modular
  drivers/cpuidle: make cpuidle-ux500.c explicitly non-modular
  drivers/cpuidle: make cpuidle-clps711x.c explicitly non-modular
  cpuidle,menu: smooth out measured_us calculation
  cpuidle,menu: use interactivity_req to disable polling
  cpuidle,x86: increase forced cut-off for polling to 20us