diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /Documentation/DocBook/usb.tmpl | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'Documentation/DocBook/usb.tmpl')
| -rw-r--r-- | Documentation/DocBook/usb.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl index af293606fbe3..8d57c1888dca 100644 --- a/Documentation/DocBook/usb.tmpl +++ b/Documentation/DocBook/usb.tmpl | |||
| @@ -690,7 +690,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param) | |||
| 690 | </para><para> | 690 | </para><para> |
| 691 | This request lets kernel drivers talk to user mode code | 691 | This request lets kernel drivers talk to user mode code |
| 692 | through filesystem operations even when they don't create | 692 | through filesystem operations even when they don't create |
| 693 | a charactor or block special device. | 693 | a character or block special device. |
| 694 | It's also been used to do things like ask devices what | 694 | It's also been used to do things like ask devices what |
| 695 | device special file should be used. | 695 | device special file should be used. |
| 696 | Two pre-defined ioctls are used | 696 | Two pre-defined ioctls are used |