diff options
author | David S. Miller <davem@davemloft.net> | 2015-05-23 01:22:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-23 01:22:35 -0400 |
commit | 81e2c0b145e1fb9f986a485189a81d779c5b86d4 (patch) | |
tree | 02635e963c4528701f3f00daee262f5ad67e1275 /crypto/asymmetric_keys/x509_public_key.c | |
parent | d6fa19e0ac08b414e42d9858fc4d473865f05e79 (diff) | |
parent | 4e162cdaa04aef597fab3bf2b413dcd8a6f2a9ae (diff) | |
download | linux-crypto-81e2c0b145e1fb9f986a485189a81d779c5b86d4.tar.gz linux-crypto-81e2c0b145e1fb9f986a485189a81d779c5b86d4.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cadence/macb.c
drivers/net/phy/phy.c
include/linux/skbuff.h
net/ipv4/tcp.c
net/switchdev/switchdev.c
Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.
phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.
tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.
macb.c involved the addition of two zyncq device entries.
skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/asymmetric_keys/x509_public_key.c')
0 files changed, 0 insertions, 0 deletions