From: Wolfgang Denk <wd@denx.de>
Date: Thu, 8 Dec 2011 19:54:13 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2011.12-rc1~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4b6f394fc41d7aee40467c30807b5ea03e2f6649;p=oweals%2Fu-boot.git

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

* 'master' of git://git.denx.de/u-boot-nand-flash:
  nand_spl/nand_boot.c: Fix build warning
  drivers/mtd/nand/nand_spl_load.c: Fix GCC 4.6 warning
  drivers/mtd/nand/nand_spl_simple.c: Fix GCC 4.6 warnings
---

4b6f394fc41d7aee40467c30807b5ea03e2f6649