diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /net/sctp/associola.c | |
parent | team: add support for non-ethernet devices (diff) | |
parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
download | linux-1304a7343b30fc4f16045412efdbb4179a3d9255.tar.xz linux-1304a7343b30fc4f16045412efdbb4179a3d9255.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sctp/associola.c')
0 files changed, 0 insertions, 0 deletions