diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
| commit | d3ec3a1fd08f705d1b319db4113590944bcde749 (patch) | |
| tree | 598a0da59e027b455f11beab24a96ef1e56fbbcb /include/uapi/linux/firewire-cdev.h | |
| parent | 8f898fbbe5ee5e20a77c4074472a1fd088dc47d1 (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
Merge tag 'v3.11-rc5' into sched/core
Merge Linux 3.11-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/firewire-cdev.h')
| -rw-r--r-- | include/uapi/linux/firewire-cdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/firewire-cdev.h b/include/uapi/linux/firewire-cdev.h index d50036953497..1db453e4b550 100644 --- a/include/uapi/linux/firewire-cdev.h +++ b/include/uapi/linux/firewire-cdev.h @@ -215,8 +215,8 @@ struct fw_cdev_event_request2 { * with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with * %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets * without the interrupt bit set that the kernel's internal buffer for @header - * is about to overflow. (In the last case, kernels with ABI version < 5 drop - * header data up to the next interrupt packet.) + * is about to overflow. (In the last case, ABI versions < 5 drop header data + * up to the next interrupt packet.) * * Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT): * |