Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2015 14:21:25 +0000 (07:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2015 14:21:25 +0000 (07:21 -0700)
Conflicts:
net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/dra7.dtsi
drivers/net/dsa/mv88e6xxx.c
drivers/net/ethernet/ibm/emac/core.h
drivers/net/ethernet/intel/i40e/i40e_adminq.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40evf/i40e_adminq.c
include/linux/mlx5/device.h
net/core/net-sysfs.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/ipv6/route.c

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