From: Wolfgang Denk Date: Mon, 3 Sep 2012 19:22:02 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=6c43d11f3db5289398f882fc9d4158c5abe3a344;p=u-boot.git 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 --- 6c43d11f3db5289398f882fc9d4158c5abe3a344