diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-10 03:14:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-10 03:14:53 +0100 |
| commit | cd63204c55a207873eee1e8e225bccc9ae27d949 (patch) | |
| tree | cf5fa6ad8839a62cbc82e64e578d0ff7f05928d2 /drivers/amba | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux i... (diff) | |
| download | linux-cd63204c55a207873eee1e8e225bccc9ae27d949.tar.xz linux-cd63204c55a207873eee1e8e225bccc9ae27d949.zip | |
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 'drivers/amba')
0 files changed, 0 insertions, 0 deletions