Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Thu, 8 Dec 2011 19:54:13 +0000 (20:54 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 8 Dec 2011 19:54:13 +0000 (20:54 +0100)
commit4b6f394fc41d7aee40467c30807b5ea03e2f6649
treeebf219811d5aecaf9db92ebe5b09c5f246d67bfc
parent3073abdd6af53b9da88cd9a47fc9f7ce65fd20ea
parent40a0682d4ae69bdd8b6aa10b6dcb57a489ae875c
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