From: Linus Torvalds Date: Thu, 19 Jun 2014 17:58:28 +0000 (-1000) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=894e552cfaa3389f934dc68180bac692aebcf26b;p=openwrt%2Fstaging%2Fblogic.git 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 --- 894e552cfaa3389f934dc68180bac692aebcf26b