From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Apr 2013 03:33:38 +0000 (-0700)
Subject: Merge tag 'pm-3.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v3.12-rc1~1073
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3ab02b4c5d2ba0eff137a9442b80944ce2d9366;p=kernel%2Fkernel-generic.git

Merge tag 'pm-3.9-rc7' of git://git./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
---

a3ab02b4c5d2ba0eff137a9442b80944ce2d9366