diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-17 08:15:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-17 08:15:41 -0500 |
| commit | 750b50ab5687125d8a1dc946d931b00acf016e2c (patch) | |
| tree | eacec989ec38e67da84fcc6842b364670d7a1e34 /net/sctp | |
| parent | ab479995b191b4256183956c13caabb86331af8e (diff) | |
| parent | 70c07e02625ec46d0ffbfce1acef42d660803528 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions