diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-03 21:03:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-03 21:09:12 -0500 |
| commit | 5cb90f703b23854283f9767a3a14fd33dfa8816d (patch) | |
| tree | 38294b581f0dc561b30ef40df85e724acfd12afe /crypto/jitterentropy.c | |
| parent | ee8815558138ae82da14dd55f281d20fb15fb1f9 (diff) | |
| parent | b1d13cb9d87a3d25f79388d8db914a482ce5b3b7 (diff) | |
| download | linux-crypto-5cb90f703b23854283f9767a3a14fd33dfa8816d.tar.gz linux-crypto-5cb90f703b23854283f9767a3a14fd33dfa8816d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/renesas/ravb_main.c
kernel/bpf/syscall.c
net/ipv4/ipmr.c
All three conflicts were cases of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/jitterentropy.c')
0 files changed, 0 insertions, 0 deletions