Tom Rini e4a94ce4ac 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
2016-05-27 20:34:12 -04:00
..
2016-02-06 12:00:59 +01:00
2015-08-23 11:56:20 +02:00
2016-05-17 09:54:43 -06:00
2014-02-22 19:30:27 +01:00
2014-10-25 07:02:01 -04:00
2016-05-17 09:54:43 -06:00
2016-05-17 09:54:43 -06:00
2015-05-06 17:00:58 +09:00
2015-08-31 17:26:03 +09:00