diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-08 09:33:34 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-08 09:33:34 -0700 |
commit | 3f97fae9482dac1dbdd870a25c89033d3a0b35dc (patch) | |
tree | c98fb21da14bf22ab7ea23098945e31bef6558fc /net/sctp | |
parent | net: Fix default in docs for tcp_orphan_retries. (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem (diff) | |
download | linux-dev-3f97fae9482dac1dbdd870a25c89033d3a0b35dc.tar.xz linux-dev-3f97fae9482dac1dbdd870a25c89033d3a0b35dc.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions