git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 2 Oct 2015 14:21:25 +0000 (07:21 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 2 Oct 2015 14:21:25 +0000 (07:21 -0700)
commit	23cc6b0f7d54ec643e7a747bc4f30503c7e347c7
tree	ff2bcb135ebf090d7b383d55123b621f4590632c	tree \| snapshot
parent	f2e7d55842d61e0fdf83cd1ecd9a3e0f78e08257	commit \| diff
parent	7cab2bc76e60a59601963774fea73ebce054bb90	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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:

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra7.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/emac/core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_adminq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40evf/i40e_adminq.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/device.h	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history