summaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-18 14:48:30 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-18 14:48:30 -0700
commit82d048186e403f36e083b37ad42aa90abb7dcaac (patch)
treedc0b92ace036ef435318f38ef35b8c6e6b84103a /net/sctp
parent62551d3ea05242d97d47f26fb517b2dfdb752310 (diff)
parentd3707d9918d47c0997a6b1e4ae24e7ab55e43796 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions