From: Wolfgang Denk <wd@denx.de>
Date: Sat, 3 Mar 2012 14:15:07 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2012.04-rc1~98
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e91004201c4265edf7897c4f8e0c21cd1dce0505;p=u-boot

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

* 'master' of git://git.denx.de/u-boot-nand-flash:
  cmd_nand.c: Fix 'nand dump' after latest MTD resync
  mtd/nand:Fix wrong usage of is_blank() in fsl_ifc_run_command
  mtd/nand: Fix IFC driver to support 2K NAND page
  nand: reinstate lazy bad block scanning
  Revert "nand: make 1-bit software ECC configurable"
---

e91004201c4265edf7897c4f8e0c21cd1dce0505