From: Tom Rini <trini@ti.com>
Date: Tue, 18 Dec 2012 01:39:45 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2013.01-rc3~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e80e588bb8db254fd939f83116ccf901bd233066;p=oweals%2Fu-boot.git

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

e80e588bb8db254fd939f83116ccf901bd233066