diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-02 00:46:35 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-02 00:46:35 +0100 |
commit | 7e8f44f8d4fa9bb35e32c161fbcdbd6b9e6400e3 (patch) | |
tree | cf6d526a070a06b365ab0ceb4e1c3ca9ad94666e /net/sctp/sysctl.c | |
parent | ipsec: can not add camellia cipher algorithm when using "ip xfrm state" command (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff) | |
download | linux-7e8f44f8d4fa9bb35e32c161fbcdbd6b9e6400e3.tar.xz linux-7e8f44f8d4fa9bb35e32c161fbcdbd6b9e6400e3.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/sctp/sysctl.c')
0 files changed, 0 insertions, 0 deletions