From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Aug 2013 16:59:00 +0000 (-0700)
Subject: Merge tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v3.11-rc6~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2d2843e614f6f7aced9dd351a056ac1150d3f82f;p=~emulex%2Finfiniband.git

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

Pull power management fix from Rafael Wysocki:
 "The removal of delayed_work_pending() checks from kernel/power/qos.c
  done in 3.9 introduced a deadlock in pm_qos_work_fn().

  Fix from Stephen Boyd"

* tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()
---

2d2843e614f6f7aced9dd351a056ac1150d3f82f