diff options
| author | Boris Brezillon <[email protected]> | 2018-04-04 20:13:35 +0000 |
|---|---|---|
| committer | Boris Brezillon <[email protected]> | 2018-04-04 20:13:35 +0000 |
| commit | fe5f31a8010a0cb13e72cfb72905fefa2a41730c (patch) | |
| tree | 324d237e47092cc66b13c7421dbda6ea6961c6b4 /security/selinux/hooks.c | |
| parent | Merge tag 'nand/for-4.17' of git://git.infradead.org/linux-mtd into mtd/next (diff) | |
| parent | Linux 4.16-rc2 (diff) | |
| download | kernel-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.tar.gz kernel-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.zip | |
Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next
Backmerge v4.16-rc2 into mtd/next to resolve a conflict between Linus'
master branch and nand/for-4.17.
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions