commit a3ab02b4c5d2ba0eff137a9442b80944ce2d9366
author Linus Torvalds <torvalds@linux-foundation.org> Thu Apr 11 20:33:38 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Apr 11 20:33:38 2013 -0700
tree 236fb818fd1bde59c61a1a7b89851e480573a343
parent 89a132ac273815c3f573684f7a79840e8930d3e1
parent 6f389a8f1dd22a24f3d9afc2812b30d639e94625

Merge tag 'pm-3.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:

 - System reboot/halt fix related to CPU offline ordering from Huacai
   Chen.

 - intel_pstate driver fix for a delay time computation error
   occasionally crashing systems using it from Dirk Brandewie.

* tag 'pm-3.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / reboot: call syscore_shutdown() after disable_nonboot_cpus()
  cpufreq / intel_pstate: Set timer timeout correctly