summaryrefslogtreecommitdiff
path: root/Documentation/usb
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-04 09:48:26 +0300
committerIngo Molnar <mingo@kernel.org>2016-05-04 09:48:26 +0300
commitd63c214b0a39e7e92fbae2a47b66e8145c3c9c81 (patch)
treeca797379eeb01c96308c8e2abdcea3b55040d489 /Documentation/usb
parent47a541c3e19374ec9f5d3d96730a922e8480dda5 (diff)
parent04974df8049fc4240d22759a91e035082ccd18b4 (diff)
downloadlinux-d63c214b0a39e7e92fbae2a47b66e8145c3c9c81.tar.xz
Merge tag 'v4.6-rc6' into x86/platform, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/usb')
-rw-r--r--Documentation/usb/gadget_multi.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/usb/gadget_multi.txt b/Documentation/usb/gadget_multi.txt
index 7d66a8636cb5..5faf514047e9 100644
--- a/Documentation/usb/gadget_multi.txt
+++ b/Documentation/usb/gadget_multi.txt
@@ -43,7 +43,7 @@ For the gadget two work under Windows two conditions have to be met:
First of all, Windows need to detect the gadget as an USB composite
gadget which on its own have some conditions[4]. If they are met,
Windows lets USB Generic Parent Driver[5] handle the device which then
-tries to much drivers for each individual interface (sort of, don't
+tries to match drivers for each individual interface (sort of, don't
get into too many details).
The good news is: you do not have to worry about most of the