Merging upstream version 2.10.

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

Documentation/nvme-admin-passthru.txt

@@ -19,7 +19,7 @@ SYNOPSIS
 			[--metadata-len=<len> | -m <len>]
 			[--input-file=<file> | -i <file>]
 			[--read | -r] [--write | -w]
-			[--timeout=<to> | -t <to>]
+			[--timeout=<timeout> | -t <timeout>]
 			[--show-command | -s]
 			[--dry-run | -d]
 			[--raw-binary | -b]
@@ -123,6 +123,10 @@ OPTIONS
 --verbose::
 	Increase the information detail in the output.
 
+-t <timeout>::
+--timeout=<timeout>::
+	Override default timeout value. In milliseconds.
+
 EXAMPLES
 --------
 * The following will run the admin command with opcode=6 and cdw10=1, which