From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 15 Apr 2013 21:55:16 +0000 (-0300)
Subject: Merge tag 'v2013.04-rc3' into patches-2013.04
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6675aaab17b944867aa13164e50ecdab0884b8b8;p=bsp%2Fu-boot.git

Merge tag 'v2013.04-rc3' into patches-2013.04

Prepare v2013.04-rc3

* tag 'v2013.04-rc3': (175 commits)
  Prepare v2013.04-rc3
  cosmetic: fix CONFIG_SPL_BSS_MAX_SIZE typo in README
  smdk5250, snow: convert to CONFIG_SPL_MAX_FOOTPRINT
  da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT
  cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT
  ARM: fix CONFIG_SPL_MAX_SIZE semantics
  fsl_esdhc: Fix DMA transfer completion waiting loop
  fsl_esdhc: flush cache after IO completion
  ARM: Fix __bss_start and __bss_end in linker scripts
  spi: mxc_spi: Set master mode for all channels
  mx6qsabre{sd, auto}: Fix environment as 'mmc rescan' takes no arguments
  BUGFIX: arm: data abort in get_bad_stack_swi
  tpm: Add TPM command library
  exynos: Enable I2C TPM for smdk5250
  tpm: Add Infineon slb9635_i2c TPM driver
  tpm: Add casts for proper compilation
  integrator: enable device tree
  VCMA9: Enable CONFIG_CMD_NAND_YAFFS
  omap5_common.h: Switch to ext4
  omap3: Display MHz instead of mHz on the console
  ...

Conflicts:
	MAINTAINERS
	include/configs/wandboard.h
---

6675aaab17b944867aa13164e50ecdab0884b8b8