David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-09 15:59:24 -04:00
..
dts	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
.gitignore	arm64: Build infrastructure	2012-09-17 13:42:21 +01:00
install.sh	arm64: kbuild: make "make install" not depend on vmlinux	2016-02-19 10:33:35 +00:00
Makefile	arm64: kbuild: make "make install" not depend on vmlinux	2016-02-19 10:33:35 +00:00