Merge branch 'pm-cpuidle' into fixes

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