]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6d436ec e202d7f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Apr 2015 19:44:14 +0000 (15:44 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Apr 2015 19:44:14 +0000 (15:44 -0400)
commit27505b0f5ca596e9d94d38e7fe3df9c56ddfa80f
tree56f227c9cb668686ca5c2cd9a7ae188b74c0f2f2tree | snapshot
parent6d436ecfb5ad59ff78a5ba993d491f38178c94cccommit | diff
parente202d7ffd7f21b671ffd77b80c932595f31f9139commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/emulex/benet/be.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
include/linux/brcmphy.h diff1 | diff2 | blob | history
net/ipv4/fou.c diff1 | diff2 | blob | history
net/ipv4/geneve.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/ip6_vti.c diff1 | diff2 | blob | history
net/rds/rds.h diff1 | diff2 | blob | history
net/rds/send.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.