]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d838d7 a7227a0)
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)
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


Trivial merge
Ubuntu combined Linux kernel mirror