From: Tom Rini <trini@ti.com>
Date: Wed, 5 Mar 2014 02:23:42 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2014.04-rc2~28
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=e4b87e5b1d026bd010e2ba3abbf89561e8320287

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

e4b87e5b1d026bd010e2ba3abbf89561e8320287