From: Wolfgang Denk <wd@denx.de>
Date: Sun, 15 May 2011 21:23:36 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2013.04~3140
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=535abb96fb665402894b820f934deaca61ce3d3e;p=bsp%2Fu-boot.git

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

535abb96fb665402894b820f934deaca61ce3d3e