From: Wolfgang Denk <wd@denx.de>
Date: Wed, 8 Jun 2011 21:29:04 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2025.01-rc5-pxa1908~19385
X-Git-Url: http://git.dujemihanovic.xyz/img/static/%7B%7B?a=commitdiff_plain;h=9571865e0d32b1bcf8a6625497d1cd5d4bbad354;p=u-boot.git

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

* 'master' of git://git.denx.de/u-boot-arm:
  SMDK6400: fix the compiler error
  imx27lite: Remove local config.mk
  mx31ads: Fix environment location on flash
  imx31_litekit: Remove local config.mk
  mx31litekit: Fix boot with the new relocation scheme.
  mx31ads: Use the new relocation scheme
---

9571865e0d32b1bcf8a6625497d1cd5d4bbad354