diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 19:58:28 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 19:58:28 +0200 |
commit | 894e552cfaa3389f934dc68180bac692aebcf26b (patch) | |
tree | bf0cab9dd4c0596faa05479b4e3d5c2d206afd7d /arch/arm/mach-omap2/usb-host.c | |
parent | Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/lin... (diff) | |
parent | security: add Serge Hallyn as a maintainer (diff) | |
download | linux-894e552cfaa3389f934dc68180bac692aebcf26b.tar.xz linux-894e552cfaa3389f934dc68180bac692aebcf26b.zip |
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
Diffstat (limited to 'arch/arm/mach-omap2/usb-host.c')
0 files changed, 0 insertions, 0 deletions