diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-13 01:19:43 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-13 01:19:43 -0700 |
commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
tree | 4f583715a29ac95723b85532f47c3c568a544f1d /net/sctp | |
parent | 7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff) | |
parent | 7d2e3cb7000b883a8e489485ac249be572fe17b1 (diff) | |
download | linux-99dd1a2b8347ac2ae802300b7862f6f7bcf17139.tar.bz2 |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions