]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5ab702 5d1c883)
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Mon, 3 Sep 2012 19:22:02 +0000 (21:22 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 3 Sep 2012 19:22:02 +0000 (21:22 +0200)
* '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>

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