diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-11 10:38:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-11 10:38:10 -0700 |
| commit | 2278cb0bb3a177d3a3ef0bd332916180cb2f2121 (patch) | |
| tree | 8c2ded2376de8aaa9640ca74c07653508064e097 /fs/btrfs/dev-replace.c | |
| parent | Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (diff) | |
| parent | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2 (diff) | |
| download | linux-dev-2278cb0bb3a177d3a3ef0bd332916180cb2f2121.tar.xz linux-dev-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 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions