]> git.sur5r.net Git - u-boot/commitdiff
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)
* '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


Trivial merge