diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:05:17 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:05:17 +0300 |
| commit | 415d2b3392d7a80903e0f97f051201aa02bf20e9 (patch) | |
| tree | 47492d2386a0e7f00ef645313cb44ae4960b7e7e /Documentation/admin-guide/LSM/apparmor.rst | |
| parent | 4f65245f2d178b9cba48350620d76faa4a098841 (diff) | |
| parent | b8e759b8f6dab1c473c30ac12709095d0b81078e (diff) | |
| download | linux-415d2b3392d7a80903e0f97f051201aa02bf20e9.tar.xz | |
Merge branch 'for-4.19/cougar' into for-linus
New device support for hid-cougar
Diffstat (limited to 'Documentation/admin-guide/LSM/apparmor.rst')
| -rw-r--r-- | Documentation/admin-guide/LSM/apparmor.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/admin-guide/LSM/apparmor.rst b/Documentation/admin-guide/LSM/apparmor.rst index 3e9734bd0e05..6cf81bbd7ce8 100644 --- a/Documentation/admin-guide/LSM/apparmor.rst +++ b/Documentation/admin-guide/LSM/apparmor.rst @@ -44,8 +44,8 @@ Links Mailing List - apparmor@lists.ubuntu.com -Wiki - http://apparmor.wiki.kernel.org/ +Wiki - http://wiki.apparmor.net -User space tools - https://launchpad.net/apparmor +User space tools - https://gitlab.com/apparmor -Kernel module - git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git +Kernel module - git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor |