From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 10 Jan 2014 02:08:58 +0000 (+0100)
Subject: Merge branch 'pm-cpuidle'
X-Git-Tag: v3.13-rc8~7^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=13de22c59fd1f5a452fea806a5f822883deec88b;p=linux-block.git

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  intel_idle: close avn_cstates array with correct marker
  Revert "intel_idle: mark states tables with __initdata tag"
---

13de22c59fd1f5a452fea806a5f822883deec88b