]> Git Repo - linux.git/commitdiff
Merge branch 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <[email protected]>
Tue, 31 Mar 2020 22:49:51 +0000 (15:49 -0700)
committerLinus Torvalds <[email protected]>
Tue, 31 Mar 2020 22:49:51 +0000 (15:49 -0700)
Pull security subsystem updates from James Morris:
 "Two minor updates for the core security subsystem:

   - kernel-doc warning fixes from Randy Dunlap

   - header cleanup from YueHaibing"

* 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: remove duplicated include from security.h
  security: <linux/lsm_hooks.h>: fix all kernel-doc warnings

1  2 
include/linux/lsm_hooks.h
include/linux/security.h

Simple merge
Simple merge
This page took 0.070503 seconds and 4 git commands to generate.