]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 04:45:31 +0000 (21:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 04:45:31 +0000 (21:45 -0700)
15 files changed:
1  2 
MAINTAINERS
drivers/net/ethernet/Makefile
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/phy/fixed_phy.c
drivers/net/phy/phy.c
drivers/net/vxlan.c
include/linux/skbuff.h
net/core/skbuff.c
net/ipv6/ip6_gre.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge