From: Rafael J. Wysocki Date: Fri, 10 Jan 2014 02:08:58 +0000 (+0100) Subject: Merge branch 'pm-cpuidle' X-Git-Tag: firefly_0821_release~176^2~4688^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=13de22c59fd1f5a452fea806a5f822883deec88b;p=firefly-linux-kernel-4.4.55.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