diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-11-07 18:58:01 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-07 18:58:01 -0700 |
| commit | ff66c00b765382771e171801842c1c2e8116f8f3 (patch) | |
| tree | 0d4d457e9d471bc0817a8df31a88546722422e21 /Documentation/index.rst | |
| parent | 78566cf137dab5682d00721d6f7277cedbc2635d (diff) | |
| parent | 799a545bb9383c6185ad27063adca03d28ee1823 (diff) | |
| download | linux-ff66c00b765382771e171801842c1c2e8116f8f3.tar.gz linux-ff66c00b765382771e171801842c1c2e8116f8f3.tar.bz2 linux-ff66c00b765382771e171801842c1c2e8116f8f3.zip | |
Merge branch 'tpm' into docs-next
Diffstat (limited to 'Documentation/index.rst')
| -rw-r--r-- | Documentation/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/index.rst b/Documentation/index.rst index 3bb82fb11a4d..1dff9fa106bd 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -57,6 +57,7 @@ needed). media/index gpu/index 80211/index + security/index Indices and tables ================== |