From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jul 2012 21:15:43 +0000 (-0700)
Subject: Merge tag 'pm-post-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a5e135122c9c5af9e63962e13159174c3aaea858;p=deliverable%2Flinux.git

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

a5e135122c9c5af9e63962e13159174c3aaea858