From: Wolfgang Denk Date: Wed, 11 Jun 2008 19:33:16 +0000 (+0200) Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5ea67393b8b554b8165c38912d753a8df043020d;p=u-boot.git Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx Conflicts: include/asm-ppc/fsl_lbc.h Signed-off-by: Wolfgang Denk --- 5ea67393b8b554b8165c38912d753a8df043020d