From: Tom Rini <trini@ti.com>
Date: Fri, 2 Jan 2015 12:42:58 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-spi
X-Git-Tag: v2015.01~87
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b4a0b4006fe4d6542899abf402c0569b11aa18e2;p=oweals%2Fu-boot.git

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

b4a0b4006fe4d6542899abf402c0569b11aa18e2