[GIT PULL] Last-minute power management update for 3.5

[Rafael J. Wysocki]

Hi Linus,

Sorry for the late pull request, but the change in question was only proposed
by Michael for the first time a couple of days ago and I agree that it would be
less painful to make it now rather than later.  This only is a rename of one
capability affecting code that's new in v3.5-rc, so no one should be hurt too
much and everyone concerned appears to be fine with this change.

Please pull from the git repository at

  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm-post-3.5-rc7

to receive single commit d9914cf66181b8aa0929775f5c6f675c6ebc3eb5

  PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND

on top of 84a1caf1453c3d44050bd22db958af4a7f99315c

  Linux 3.5-rc7

This changes the name of CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND to
encourage reuse of that capability in related cases.

Thanks!


 fs/eventpoll.c             | 2 +-
 include/linux/capability.h | 6 +++---
 include/linux/eventpoll.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

---------------

Michael Kerrisk (1):
      PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/