From: Tom Rini <trini@konsulko.com>
Date: Mon, 26 Nov 2018 18:45:29 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-riscv
X-Git-Tag: v2019.01-rc1~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef0b75d3d8afccebd3b9822de6bcae358d4bc0e3;p=pandora-u-boot.git

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

ef0b75d3d8afccebd3b9822de6bcae358d4bc0e3
diff --cc board/AndesTech/ax25-ae350/MAINTAINERS
index 508c6ace721,508c6ace721..d87446ee1c3
--- a/board/AndesTech/ax25-ae350/MAINTAINERS
+++ b/board/AndesTech/ax25-ae350/MAINTAINERS
@@@ -3,4 -3,4 +3,6 @@@ M:	Rick Chen <rick@andestech.com
  S:	Maintained
  F:	board/AndesTech/ax25-ae350/
  F:	include/configs/ax25-ae350.h
++F:	configs/a25-ae350_32_defconfig
++F:	configs/ax25-ae350_64_defconfig
  F:	configs/ax25-ae350_defconfig