From: Wolfgang Denk <wd@denx.de>
Date: Tue, 4 Oct 2011 20:20:25 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2011.12-rc1~599
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f7549d2dc00023c5f33d1adc7fee0a77575fcb2;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:
  PPC: Fix socrates NAND problem
  PPC: Fix fsl_upm.c by renaming nand handling functions
  NAND: Make page, erase, oob size available via cmd_nand
  mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi
  NAND: Add -y option to nand scrub command
  NAND: Add nand read.raw and write.raw commands
  NAND: Really ignore bad blocks when scrubbing
  spl, nand: add 4bit HW ecc oob first nand_read_page function
  mxc_nand: fix a problem writing more than 32MB
  mxc_nand: fixed some typos (cosmetic)
  nand: increase chip_delay in mv kirkwood nand driver
---

4f7549d2dc00023c5f33d1adc7fee0a77575fcb2