From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Nov 2012 22:16:43 +0000 (-1000)
Subject: Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: upstream/snapshot3+hdmi~6209
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0543d64388146f83ff7aef4abb42f8fd074d5e0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

a0543d64388146f83ff7aef4abb42f8fd074d5e0