From: Tom Rini <trini@konsulko.com>
Date: Sat, 11 Aug 2018 23:49:29 +0000 (-0400)
Subject: Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2018.09-rc2~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8fee226da36f799e69041b2ab381064693199c7f;p=oweals%2Fu-boot.git

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
---

8fee226da36f799e69041b2ab381064693199c7f
diff --cc test/dm/Makefile
index 564e8460bd,ff0807873b..67c1fe6d01
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@@ -44,5 -44,5 +44,6 @@@ obj-$(CONFIG_DM_VIDEO) += video.
  obj-$(CONFIG_ADC) += adc.o
  obj-$(CONFIG_SPMI) += spmi.o
  obj-$(CONFIG_WDT) += wdt.o
 +obj-$(CONFIG_AXI) += axi.o
+ obj-$(CONFIG_MISC) += misc.o
  endif