diff options
author | David S. Miller <davem@davemloft.net> | 2016-08-19 04:14:37 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-08-19 04:14:37 (GMT) |
commit | e951f145d1724769546efe2e04f6cb2b7037d7ea (patch) | |
tree | 5be9dff97c6e466c0956df3a5bc1f60581f2758c /crypto/arc4.c | |
parent | 37bd91d1d9a9a3ab5e8f7efedadc4ced5d2d0a3a (diff) | |
parent | 5a0950c27236dc6f6a3e9d13259c1a2e89fd1cf7 (diff) | |
download | linux-e951f145d1724769546efe2e04f6cb2b7037d7ea.tar.xz |
Merge branch 'tipc-next'
Jon Maloy says:
====================
tipc: bearer and link improvements
The first commit makes it possible to set and check the 'blocked' state
of a bearer from the generic bearer layer. The second commit is a small
improvement to the link congestion mechanism.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/arc4.c')
0 files changed, 0 insertions, 0 deletions