From: Tom Rini <trini@ti.com>
Date: Mon, 25 Nov 2013 15:42:13 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2014.01-rc1~3
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=faca8ff55f4a2cf45fb906cc37f44601149fc00e

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

faca8ff55f4a2cf45fb906cc37f44601149fc00e