From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Tue, 3 Jul 2012 17:07:21 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle' into pm-domains
X-Git-Tag: v3.6-rc1~155^2~7^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e3b8cdd8e4ea51e46d3ff54d7e3568afc24654ec;p=linux.git

Merge branch 'pm-cpuidle' into pm-domains

* pm-cpuidle:
  PM / cpuidle: Add driver reference counter
  cpuidle: move field disable from per-driver to per-cpu
---

e3b8cdd8e4ea51e46d3ff54d7e3568afc24654ec