2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
linux-next/arch/arm64/boot
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
dts Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05: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