]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2007ebf 6546ff6)
Merge tag 'pm-post-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Jul 2012 21:15:43 +0000 (14:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Jul 2012 21:15:43 +0000 (14:15 -0700)
commit243abcd80e0e02616b5910763abd1086c9ecd109
tree7d946840ff28f0d3a34a1bf2c4c7d448e3677627tree | snapshot
parent2007ebf362fd7bd116ccfde58f62146f7b73f1e1commit | diff
parent6546ff62e8d015fd11637c16cf5fcbc4623105eacommit | diff
Merge tag 'pm-post-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull a last-minute PM update from Rafael J. Wysocki:
 "This renames CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND to encourage future
  reuse of the capability in question in related cases."

* tag 'pm-post-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
Linux Kernel Source Tree.