Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jun 2014 17:58:28 +0000 (07:58 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jun 2014 17:58:28 +0000 (07:58 -1000)
commit894e552cfaa3389f934dc68180bac692aebcf26b
treebf0cab9dd4c0596faa05479b4e3d5c2d206afd7d
parent3d09c623947a855ab9a21267c31f926cafa2c5bb
parent70b4a2598c4d88842c083eff7e28e8cc287bab5b
Merge branch 'for-linus' of git://git./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