From: Wolfgang Denk <wd@denx.de>
Date: Thu, 1 Dec 2011 22:58:11 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
X-Git-Tag: v2011.12-rc1~106^2~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d51e6d6de2b7dcba43fadcae2c89f7346d8bc301;p=u-boot

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

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  mpc85xx: support for Freescale COM Express P2020
  arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning
  mpc85xx: support board-specific reset function
  powerpc/85xx: verify the localbus device tree address before booting the OS
  mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification
  powerpc/p3060qds: Add board related support for P3060QDS platform
  powerpc/85xx: clean up and document the QE/FMAN microcode macros
  powerpc/85xx: always implement the work-around for Erratum SATA_A001
  powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h
  powerpc/85xx: Add workaround for erratum A-003474
  powerpc/85xx: fixup flexcan device tree clock-frequency
  powerpc/85xx: Add workaround for erratum CPU-A003999
---

d51e6d6de2b7dcba43fadcae2c89f7346d8bc301