From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Mar 2012 00:04:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: upstream/snapshot3+hdmi~7981
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' of git://git./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
---

33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0