From: Wolfgang Denk Date: Sat, 11 Feb 2012 21:14:56 +0000 (+0100) Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians X-Git-Tag: v2012.04-rc1~257 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f57a94c2b566a647003c7885a450ba0f28dbff34;p=u-boot Merge branch 'master' of /home/wd/git/u-boot/custodians * 'master' of /home/wd/git/u-boot/custodians: nand/fsl_elbc: Convert to self-init nand: Introduce CONFIG_SYS_NAND_SELF_INIT nand_spl: store ecc data on the stack mtd/nand: Add ONFI support for FSL NAND controller nand: make 1-bit software ECC configurable nand: Sanitize ONFI strings. nand: Merge changes to BBT from Linux nand driver nand: Merge changes from Linux nand driver nand: cleanup whitespace nand: Add more NAND types from Linux nand driver nand: Merge BCH code from Linux nand driver NAND: Remove additional (CONFIG_SYS)_NAND_MAX_CHIPS NAND: remove NAND_MAX_CHIPS definitions nand_spl_simple: store ecc data on the stack --- f57a94c2b566a647003c7885a450ba0f28dbff34