]> git.sur5r.net Git - u-boot/commit
Merge branch 'next' of /home/wd/git/u-boot/next
authorWolfgang Denk <wd@denx.de>
Tue, 28 Sep 2010 21:30:47 +0000 (23:30 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 28 Sep 2010 21:30:47 +0000 (23:30 +0200)
commit2e6e1772c0e34871769be4aef79748fe3e47d953
tree00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0
parent1e4e5ef0469050f014aee1204dae8a9ab6053e49
parent3df61957938586c512c17e72d83551d190400981
Merge branch 'next' of /home/wd/git/u-boot/next

Conflicts:
include/ppc4xx.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
29 files changed:
Makefile
README
arch/powerpc/cpu/mpc512x/Makefile
arch/powerpc/cpu/ppc4xx/fdt.c
board/amcc/ebony/flash.c
drivers/video/cfb_console.c
include/common.h
include/configs/CATcenter.h
include/configs/KAREF.h
include/configs/METROBOX.h
include/configs/MIP405.h
include/configs/PMC440.h
include/configs/XPEDITE1000.h
include/configs/acadia.h
include/configs/alpr.h
include/configs/hcu5.h
include/configs/icon.h
include/configs/katmai.h
include/configs/kilauea.h
include/configs/korat.h
include/configs/lwmon5.h
include/configs/makalu.h
include/configs/mcu25.h
include/configs/ocotea.h
include/configs/redwood.h
include/configs/sequoia.h
include/configs/taishan.h
include/configs/yucca.h
include/configs/zeus.h