diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-09 18:14:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-09 18:14:53 -0800 |
| commit | cd63204c55a207873eee1e8e225bccc9ae27d949 (patch) | |
| tree | cf5fa6ad8839a62cbc82e64e578d0ff7f05928d2 /fs/ext4/file.c | |
| parent | f94aa7c7f1fc474be776e4bf88088d5a007d3575 (diff) | |
| parent | f743166da7e93b617dd93120cdb5edcc8b84c464 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull SELinux fixes from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
SELinux: Fix kernel BUG on empty security contexts.
selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types
Diffstat (limited to 'fs/ext4/file.c')
0 files changed, 0 insertions, 0 deletions