]> git.ipfire.org Git - people/ms/u-boot.git/commit
Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Fri, 27 May 2016 19:49:43 +0000 (15:49 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 28 May 2016 00:34:12 +0000 (20:34 -0400)
commite4a94ce4ac77396b181663c0493c50bc2d5b9143
tree7564e2d5e7e24841a763460f7eaf91409abd0312
parent378f9134eba4665ea94a63653393d25418665fda
parent3c27b6ad540828c44a62d209030df5ba86896df0
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
common/spl/spl_mmc.c
configs/odroid-c2_defconfig
drivers/clk/clk_rk3288.c
include/efi_loader.h
lib/efi_loader/efi_disk.c