]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)
1  2 
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/ti/tlan.c

Simple merge