summaryrefslogtreecommitdiff
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-17 14:15:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-17 14:15:43 -0700
commita5e135122c9c5af9e63962e13159174c3aaea858 (patch)
tree7d946840ff28f0d3a34a1bf2c4c7d448e3677627 /drivers/block/cciss.c
parenta018540141a931f5299a866907b27886916b4374 (diff)
parentd9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (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
Diffstat (limited to 'drivers/block/cciss.c')
0 files changed, 0 insertions, 0 deletions