From: Tom Rini <trini@konsulko.com>
Date: Sun, 6 Oct 2019 22:02:18 +0000 (-0400)
Subject: Merge branch '2019-10-06-master-imports'
X-Git-Tag: v2019.10~2
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=879396a2405d394573307adf16763cbe769c35f2

Merge branch '2019-10-06-master-imports'

- Regression work-around on SoCFPGA by disabling WDT in some cases.
- Fix seg fault on 'host info' in some cases.
---

879396a2405d394573307adf16763cbe769c35f2