From: Jakub Kicinski Date: Sat, 23 Nov 2019 19:01:13 +0000 (-0800) Subject: Merge branch 'nfc-convert-from-txt-to-rst' X-Git-Tag: for-linus-20191129~13^2~17 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=72a2707a8743b62f9493e46af300f0cee4485d46;p=linux-block.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 --- 72a2707a8743b62f9493e46af300f0cee4485d46