tree 080077826cffcfebbaa0a950c663e7d165cf6b7d
parent a0a05350a74f3dec0498629914b835cc29d7d210
parent a9abb00e4792e13c8f95f7f2cd0fa97c1b328407
author Wolfgang Denk <wd@denx.de> 1213212796 +0200
committer Wolfgang Denk <wd@denx.de> 1213212796 +0200

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

Conflicts:

	include/asm-ppc/fsl_lbc.h

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