diff options
author | Linus Torvalds | 2015-07-11 19:38:10 +0200 |
---|---|---|
committer | Linus Torvalds | 2015-07-11 19:38:10 +0200 |
commit | 2278cb0bb3a177d3a3ef0bd332916180cb2f2121 (patch) | |
tree | 8c2ded2376de8aaa9640ca74c07653508064e097 /drivers/clk/zynq | |
parent | Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into... (diff) | |
download | kernel-qcow2-linux-2278cb0bb3a177d3a3ef0bd332916180cb2f2121.tar.gz kernel-qcow2-linux-2278cb0bb3a177d3a3ef0bd332916180cb2f2121.tar.xz kernel-qcow2-linux-2278cb0bb3a177d3a3ef0bd332916180cb2f2121.zip |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull selinux fixes from James Morris.
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
selinux: fix mprotect PROT_EXEC regression caused by mm change
selinux: don't waste ebitmap space when importing NetLabel categories
Diffstat (limited to 'drivers/clk/zynq')
0 files changed, 0 insertions, 0 deletions