From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 22 Feb 2013 23:41:20 +0000 (+0100)
Subject: Merge branch 'pm-cpuidle' into fixes
X-Git-Tag: MMI-PSA29.97-13-9~14955^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ecf96806beaa00cc0f50555cca0106a39c121eb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'pm-cpuidle' into fixes

* pm-cpuidle:
  microblaze idle: Fix compile error
  blackfin idle: Fix compile error
---

6ecf96806beaa00cc0f50555cca0106a39c121eb