diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-15 18:31:37 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-15 18:59:32 +0300 |
| commit | 0ddead90b223faae475f3296a50bf574b7f7c69a (patch) | |
| tree | e729c7fcdc7e3697f7fae2f3028ed0d11931c425 /net/sctp/auth.c | |
| parent | f7aec129a356ad049edddcb7e77b04a474fcf41f (diff) | |
| parent | a090bd4ff8387c409732a8e059fbf264ea0bdd56 (diff) | |
| download | linux-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/auth.c')
0 files changed, 0 insertions, 0 deletions