From: Tom Rini <trini@ti.com>
Date: Thu, 23 Oct 2014 10:54:03 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: KARO-TXA5-2015-06-26~523
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=dee8abcd80d0981f7a1c2bb5d1f2e9313fddf189

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

dee8abcd80d0981f7a1c2bb5d1f2e9313fddf189