summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-socfpga/socfpga.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-19 07:58:28 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-19 07:58:28 -1000
commit894e552cfaa3389f934dc68180bac692aebcf26b (patch)
treebf0cab9dd4c0596faa05479b4e3d5c2d206afd7d /arch/arm/mach-socfpga/socfpga.c
parent3d09c623947a855ab9a21267c31f926cafa2c5bb (diff)
parent70b4a2598c4d88842c083eff7e28e8cc287bab5b (diff)
downloadblackbird-op-linux-894e552cfaa3389f934dc68180bac692aebcf26b.tar.gz
blackbird-op-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-socfpga/socfpga.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud