diff options
| author | 2014-06-11 12:23:30 -0700 | |
|---|---|---|
| committer | 2014-06-11 12:23:30 -0700 | |
| commit | 813ebbbf8e6c3d03b2a340ed10b88b551a531452 (patch) | |
| tree | c512794d2d102e7b14d991472de8ec66c53207a4 /include/linux/timerqueue.h | |
| parent | Merge branch 'mac802154' (diff) | |
| parent | net: sctp: fix incorrect type in gfp initializer (diff) | |
Merge branch 'sctp-next'
Daniel Borkmann says:
====================
SCTP update
This set contains transport path selection improvements in
SCTP. Please see individual patches for details.
====================
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions
