Merging upstream version 2.10.

Signed-off-by: Daniel Baumann <daniel@debian.org>

Documentation/nvme-set-feature.txt

@@ -15,6 +15,7 @@ SYNOPSIS
 			[--data=<data-file> | -d <data-file>] [--save | -s]
 			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 			[--cdw12=<cdw12> | -c <cdw12>]
+			[--timeout=<timeout> | -t <timeout>]
 
 DESCRIPTION
 -----------
@@ -78,6 +79,10 @@ OPTIONS
 --cdw12=<cdw12>::
 	The value for command dword 12, if applicable.
 
+-t <timeout>::
+--timeout=<timeout>::
+	Override default timeout value. In milliseconds.
+
 EXAMPLES
 --------
 * Sets the Power State (PS) to 1 in feature id 2: