From: Wolfgang Denk <wd@denx.de>
Date: Mon, 30 Apr 2012 14:55:37 +0000 (+0200)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v2012.07-rc1~149
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0f6a4e8b17afead8add6e528936a505367c091c;p=kernel%2Fu-boot.git

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  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
---

e0f6a4e8b17afead8add6e528936a505367c091c