git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a018540 d9914cf)
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)
commita5e135122c9c5af9e63962e13159174c3aaea858
tree7d946840ff28f0d3a34a1bf2c4c7d448e3677627tree | snapshot
parenta018540141a931f5299a866907b27886916b4374commit | diff
parentd9914cf66181b8aa0929775f5c6f675c6ebc3eb5commit | diff
Merge tag 'pm-post-3.5-rc7' of git://git./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
Pandora Kernel Repository