From: Tom Rini <trini@konsulko.com>
Date: Thu, 22 Oct 2015 00:47:40 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2016.01-rc1~298
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=858dbdf8412cefb6dbc4eed63dc3de9744578455;p=pandora-u-boot.git

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

858dbdf8412cefb6dbc4eed63dc3de9744578455