Merge branches 'pm-opp' and 'pm-sleep' into linux-next

* pm-opp:
  PM / OPP: Add debugfs support
  PM / OPP: Move cpu specific code to opp/cpu.c
  PM / OPP: Move opp core to its own directory
  PM / OPP: Prefix exported opp routines with dev_pm_opp_
  PM / OPP: Rename opp init/free table routines
  PM / OPP: reuse of_parse_phandle()

* pm-sleep:
  PM / sleep: Report interrupt that caused system wakeup