[U-Boot] Pull request: nand flash

[Scott Wood]

One more patch got added to the previous pull request.

The following changes since commit 7c84fe6a06dad9f793ed85b39b1e6c11a7882f5c:
  Bartlomiej Sieka (1):
        Fix to the auto-update feature documentation (CONFIG_UPDATE_TFTP_MSEC_MAX)

are available in the git repository at:

  git://git.denx.de/u-boot-nand-flash.git master

Alessandro Rubini (1):
      NAND: Allow NAND and OneNAND to coexist

Haiying Wang (1):
      NAND: Fix CONFIG_ENV_ADDR for MPC8572DS

Jason Jin (1):
      NAND: Add NAND support for MPC8536DS board

Scott Wood (1):
      JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.

 board/freescale/mpc8536ds/law.c |    1 +
 board/freescale/mpc8536ds/tlb.c |    5 +++
 fs/jffs2/jffs2_1pass.c          |   12 +++----
 include/configs/MPC8536DS.h     |   56 ++++++++++++++++++++++++++++++-
 include/configs/MPC8572DS.h     |    2 +-
 include/linux/mtd/nand.h        |   70 +--------------------------------------
 6 files changed, 67 insertions(+), 79 deletions(-)