tree 7564e2d5e7e24841a763460f7eaf91409abd0312
parent 378f9134eba4665ea94a63653393d25418665fda
parent 3c27b6ad540828c44a62d209030df5ba86896df0
author Tom Rini <trini@konsulko.com> 1464378583 -0400
committer Tom Rini <trini@konsulko.com> 1464395652 -0400

Merge git://git.denx.de/u-boot-dm

For odroid-c2 (arch-meson) for now disable designware eth as meson
now needs to do some harder GPIO work.

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	lib/efi_loader/efi_disk.c

Modified:
	configs/odroid-c2_defconfig