diff options
author | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
commit | 917fef6f7ee8b2fe852692ac49771342bfef9433 (patch) | |
tree | b5932aab90d449841803b6f8679a4564ca2a6eaf /Documentation/security/apparmor.txt | |
parent | kernel-doc: add support for one line inline struct member doc comments (diff) | |
parent | Linux 4.9-rc4 (diff) | |
download | linux-917fef6f7ee8b2fe852692ac49771342bfef9433.tar.xz linux-917fef6f7ee8b2fe852692ac49771342bfef9433.zip |
Merge tag 'v4.9-rc4' into sound
Bring in -rc4 patches so I can successfully merge the sound doc changes.
Diffstat (limited to 'Documentation/security/apparmor.txt')
0 files changed, 0 insertions, 0 deletions