Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Nov 2012 22:16:43 +0000 (12:16 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Nov 2012 22:16:43 +0000 (12:16 -1000)
commita0543d64388146f83ff7aef4abb42f8fd074d5e0
tree003effd8c59076f18262f44592eff1eca1859e6f
parent1d838d70fb867b155ee380b37d556893a7313ed2
parenta7227a0faa117d0bc532aea546ae5ac5f89e8ed7
Merge tag 'pm-for-3.7-rc7' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management update from Rafael Wysocki:
 "Fix for an incorrect error condition check in device PM QoS code that
  may lead to an Oops from Guennadi Liakhovetski."

* tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / QoS: fix wrong error-checking condition