diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:26 -0700 |
---|---|---|
committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:26 -0700 |
commit | ee95f4059a833839bf52972191b2d4c3d3cec552 (patch) | |
tree | a1c8587d9b82e64a75dde376a90a3d69b0f4847a /Documentation/networking/index.rst | |
parent | Merge branch 'for-4.16/dax' into libnvdimm-for-next (diff) | |
parent | nfit-test: Add platform cap support from ACPI 6.2a to test (diff) | |
download | linux-dev-ee95f4059a833839bf52972191b2d4c3d3cec552.tar.xz linux-dev-ee95f4059a833839bf52972191b2d4c3d3cec552.zip |
Merge branch 'for-4.16/nfit' into libnvdimm-for-next
Diffstat (limited to 'Documentation/networking/index.rst')
-rw-r--r-- | Documentation/networking/index.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst index 66e620866245..7d4b15977d61 100644 --- a/Documentation/networking/index.rst +++ b/Documentation/networking/index.rst @@ -9,6 +9,7 @@ Contents: batman-adv kapi z8530book + msg_zerocopy .. only:: subproject @@ -16,4 +17,3 @@ Contents: ======= * :ref:`genindex` - |