diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-08 15:39:41 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-08 15:39:41 -0700 |
commit | 54dceb008ffcbe003bea9017cad1227a83b6fc3f (patch) | |
tree | d4e3345ead16da19efe38dbf97ade38309f8b4f7 /net/sctp | |
parent | 11a100f844f6096787ab20e19f17d72abc957a8f (diff) | |
parent | b46372710ab536c0967f76be5dc41341583d4a54 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions