Merge branch 'for-davem' into for-next

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

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

diff --cc security/capability.c
Simple merge

diff --cc security/security.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge