]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba5c122 84b8085)
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 8 Jun 2011 21:29:04 +0000 (23:29 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 8 Jun 2011 21:29:04 +0000 (23:29 +0200)
* '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


Trivial merge
Cloned from git://git.denx.de/u-boot.git