From: Tom Rini <trini@konsulko.com>
Date: Mon, 31 Dec 2018 13:08:33 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=51ae59228c443d2f7e1d567a3cc83130465d1426;p=u-boot.git

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

This includes x86 edison defconfig file clean up, and coreboot file
system (cbfs) fixes.
---

51ae59228c443d2f7e1d567a3cc83130465d1426