From: Tom Rini <trini@ti.com>
Date: Wed, 18 Dec 2013 23:45:39 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2014.01-rc3~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef184040b74ebba48edbc3ae7bf84b2753b8774c;p=kernel%2Fu-boot.git

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

ef184040b74ebba48edbc3ae7bf84b2753b8774c