]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0106a8 43aa09f)
Merge remote-tracking branch 'apparmor/apparmor-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:57:28 +0000 (14:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:57:28 +0000 (14:57 +1100)
1  2 
security/apparmor/lsm.c patch | diff1 | diff2 | blob | history

diff --cc security/apparmor/lsm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.