]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e0e0dc b50edd7)
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)
commit87ffabb1f055e14e7d171c6599539a154d647904
tree56f227c9cb668686ca5c2cd9a7ae188b74c0f2f2tree | snapshot
parent5e0e0dc10a8be16239eae24ab775de60821eee2dcommit | diff
parentb50edd7812852d989f2ef09dcfc729690f54a42dcommit | 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 for KaRo TX COM modules