| commit | f188b951f33a0464338f94f928338f84fc0e4392 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Dec 03 21:03:21 2015 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Dec 03 21:09:12 2015 -0500 |
| tree | 17ad63719242b1de0266627a1dc92ba869a3ba4e | |
| parent | 6b20da4d8f3f6a3be9f67e3207f435cfaa5f7f97 [diff] | |
| parent | 071f5d105a0ae93aeb02197c4ee3557e8cc57a21 [diff] |
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>