diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-17 11:13:03 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-17 11:16:20 +0200 |
| commit | 767878908e7cc28c440c5431f6591157d8bd4ae7 (patch) | |
| tree | 5780a93e07a5643e7ee33136f54b15dd7b9cab54 /Documentation/usb/usbmon.txt | |
| parent | 17038de5f16569a25343cf68668f3b657eafb00e (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| download | talos-op-linux-767878908e7cc28c440c5431f6591157d8bd4ae7.tar.gz talos-op-linux-767878908e7cc28c440c5431f6591157d8bd4ae7.zip | |
Merge tag 'v3.4-rc3' into drm-intel-next-queued
Backmerge Linux 3.4-rc3 into drm-intel-next to resolve a few things
that conflict/depend upon patches in -rc3:
- Second part of the Sandybridge workaround series - it changes some
of the same registers.
- Preparation for Chris Wilson's fencing cleanup - we need the fix
from -rc3 merged before we can move around all that code.
- Resolve the gmbus conflict - gmbus has been disabled in 3.4 again,
but should be enabled on all generations in 3.5.
Conflicts:
drivers/gpu/drm/i915/intel_i2c.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'Documentation/usb/usbmon.txt')
| -rw-r--r-- | Documentation/usb/usbmon.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt index 5335fa8b06eb..c42bb9cd3b43 100644 --- a/Documentation/usb/usbmon.txt +++ b/Documentation/usb/usbmon.txt @@ -183,10 +183,10 @@ An input control transfer to get a port status. d5ea89a0 3575914555 S Ci:1:001:0 s a3 00 0000 0003 0004 4 < d5ea89a0 3575914560 C Ci:1:001:0 0 4 = 01050000 -An output bulk transfer to send a SCSI command 0x5E in a 31-byte Bulk wrapper -to a storage device at address 5: +An output bulk transfer to send a SCSI command 0x28 (READ_10) in a 31-byte +Bulk wrapper to a storage device at address 5: -dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 5e000000 00000000 00000600 00000000 00000000 00000000 000000 +dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 ad000000 00800000 80010a28 20000000 20000040 00000000 000000 dd65f0e8 4128379808 C Bo:1:005:2 0 31 > * Raw binary format and API |
