tree 7f6f2214e85611d2549587305ac05183666cce61
parent e5ab702a6c458ad2eb041692aed3db114b5846e1
parent 5d1c88332951d2f58e9f7000a0523543b22d9a90
author Wolfgang Denk <wd@denx.de> 1346700122 +0200
committer Wolfgang Denk <wd@denx.de> 1346700122 +0200

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

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again

Signed-off-by: Wolfgang Denk <wd@denx.de>