tree bf0cab9dd4c0596faa05479b4e3d5c2d206afd7d
parent 3d09c623947a855ab9a21267c31f926cafa2c5bb
parent 70b4a2598c4d88842c083eff7e28e8cc287bab5b
author Linus Torvalds <torvalds@linux-foundation.org> 1403200708 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1403200708 -1000

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

Pull security maintainership update from James Morris:
 "Add Serge Hallyn as security subsystem co-maintainer"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: add Serge Hallyn as a maintainer