From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Sat, 23 Nov 2019 19:01:13 +0000 (-0800)
Subject: Merge branch 'nfc-convert-from-txt-to-rst'
X-Git-Tag: v5.5-rc1~174^2~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=72a2707a8743b62f9493e46af300f0cee4485d46;p=linux.git

Merge branch 'nfc-convert-from-txt-to-rst'

Robert Schwebel says:

====================
here is v2 of the series converting the NFC documentation from txt to
rst. Thanks to Jonathan and Dave for the input.

Changes since (implicit) v1:

* replace code-block by more compact :: syntax

* really add the rst file to the index
====================

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---

72a2707a8743b62f9493e46af300f0cee4485d46