]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/selinux into...
authorJames Morris <james.l.morris@oracle.com>
Thu, 24 Nov 2016 00:21:25 +0000 (11:21 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 24 Nov 2016 00:21:25 +0000 (11:21 +1100)
1  2 
fs/proc/base.c

diff --cc fs/proc/base.c
Simple merge