tree 8cb0a64fc266fdf5b9f41d99b3c27427678e5e9f
parent 9fc005c017101c498f336329c6bdf510bce8ef6e
parent 95d16c7211a5166d6e0241ca8c507718bef3c745
author Linus Torvalds <torvalds@linux-foundation.org> 1331942642 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1331942642 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull maintainer update from James Morris:
 "Please pull this patch which adds Serge as maintainer of the
  capabilities code, as discussed on lwn and the lsm list.

  New capabilities must be signed off by the maintainer, and new uses of
  any capabilities should at be cc'd to the maintainer."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  MAINTAINERS: Add Serge as maintainer of capabilities