projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d09c62 70b4a25)
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)
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


Trivial merge
John Crispins staging tree