diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-17 22:08:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-17 22:08:28 -0500 |
| commit | 66269bfd2f9dbe55f395019353e8748df34fe7d3 (patch) | |
| tree | db84f122b940b6dff1e817360f9523313c6f1196 /crypto/michael_mic.c | |
| parent | 5cb90f703b23854283f9767a3a14fd33dfa8816d (diff) | |
| parent | 53915e905e07808ea8960fabacafd2d144087bc2 (diff) | |
| download | linux-crypto-66269bfd2f9dbe55f395019353e8748df34fe7d3.tar.gz linux-crypto-66269bfd2f9dbe55f395019353e8748df34fe7d3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/geneve.c
Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/michael_mic.c')
0 files changed, 0 insertions, 0 deletions