summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-05 13:03:06 -0400
committerLen Brown <len.brown@intel.com>2005-08-05 13:03:06 -0400
commite872d4cace8681838e8d18d52c92f4870e980a08 (patch)
tree082b75cc52935efae68f9f744bc3f8807f7176c6 /Documentation
parent1f3a730117ceda2a7c917d687921fe3c82283968 (diff)
parent403fe5ae57c831968c3dbbaba291ae825a1c5aaa (diff)
downloadlinux-stable-e872d4cace8681838e8d18d52c92f4870e980a08.tar.gz
linux-stable-e872d4cace8681838e8d18d52c92f4870e980a08.tar.bz2
linux-stable-e872d4cace8681838e8d18d52c92f4870e980a08.zip
Merge ../from-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/usb/usbmon.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt
index f1896ee3bb2a..63cb7edd177e 100644
--- a/Documentation/usb/usbmon.txt
+++ b/Documentation/usb/usbmon.txt
@@ -102,7 +102,7 @@ Here is the list of words, from left to right:
- URB Status. This field makes no sense for submissions, but is present
to help scripts with parsing. In error case, it contains the error code.
In case of a setup packet, it contains a Setup Tag. If scripts read a number
- in this field, the proceed to read Data Length. Otherwise, they read
+ in this field, they proceed to read Data Length. Otherwise, they read
the setup packet before reading the Data Length.
- Setup packet, if present, consists of 5 words: one of each for bmRequestType,
bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.