From: Tom Rini <trini@konsulko.com>
Date: Fri, 15 Jan 2016 02:51:32 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-x86
X-Git-Tag: v2016.03-rc1~311
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4edde96111aefac63d6aaca6ba87a90d149e973e;p=pandora-u-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-x86
---

4edde96111aefac63d6aaca6ba87a90d149e973e