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

diff --cc arch/sandbox/dts/test.dts
Simple merge

diff --cc test/dm/Makefile
index 564e846,ff08078..67c1fe6
--- 1/test/dm/Makefile
--- 2/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