Merge branch 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris...

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

diff --cc include/linux/lsm_hooks.h
Simple merge

diff --cc include/linux/security.h
Simple merge