From: Wolfgang Denk <wd@denx.de>
Date: Mon, 30 Apr 2012 14:55:25 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
X-Git-Tag: v2012.07-rc1~149^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4212657c53f9ed66fd5adc9da9a327e3739646fb;p=oweals%2Fu-boot.git

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

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  powerpc/ppc4xx: Remove typedefs for gdsys FPGA
  powerpc/ppc4xx: Fix typo in gdsys_fpga.h
  powerpc/ppc4xx: Update gdsys board configurations
  powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20
  powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
  powerpc/ppc4xx: Make gdsys 405ep boards reset more generic
  powerpc/ppc4xx: Adjust environment size on neo
---

4212657c53f9ed66fd5adc9da9a327e3739646fb