git.librecmc.org Git - oweals/u-boot.git/commit

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	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
arch/powerpc/cpu/mpc512x/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/cpu/ppc4xx/fdt.c	diff1 \|	diff2 \|	blob \| history
board/amcc/ebony/flash.c	diff1 \|	diff2 \|	blob \| history
drivers/video/cfb_console.c	diff1 \|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history
include/configs/CATcenter.h	diff1 \|	diff2 \|	blob \| history
include/configs/KAREF.h	diff1 \|	diff2 \|	blob \| history
include/configs/METROBOX.h	diff1 \|	diff2 \|	blob \| history
include/configs/MIP405.h	diff1 \|	diff2 \|	blob \| history
include/configs/PMC440.h	diff1 \|	diff2 \|	blob \| history
include/configs/XPEDITE1000.h	diff1 \|	diff2 \|	blob \| history
include/configs/acadia.h	diff1 \|	diff2 \|	blob \| history
include/configs/alpr.h	diff1 \|	diff2 \|	blob \| history
include/configs/hcu5.h	diff1 \|	diff2 \|	blob \| history
include/configs/icon.h	diff1 \|	diff2 \|	blob \| history
include/configs/katmai.h	diff1 \|	diff2 \|	blob \| history
include/configs/kilauea.h	diff1 \|	diff2 \|	blob \| history
include/configs/korat.h	diff1 \|	diff2 \|	blob \| history
include/configs/lwmon5.h	diff1 \|	diff2 \|	blob \| history
include/configs/makalu.h	diff1 \|	diff2 \|	blob \| history
include/configs/mcu25.h	diff1 \|	diff2 \|	blob \| history
include/configs/ocotea.h	diff1 \|	diff2 \|	blob \| history
include/configs/redwood.h	diff1 \|	diff2 \|	blob \| history
include/configs/sequoia.h	diff1 \|	diff2 \|	blob \| history
include/configs/taishan.h	diff1 \|	diff2 \|	blob \| history
include/configs/yucca.h	diff1 \|	diff2 \|	blob \| history
include/configs/zeus.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
arch/powerpc/cpu/mpc512x/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/cpu/ppc4xx/fdt.c	diff1 \|	diff2 \|	blob \| history
board/amcc/ebony/flash.c	diff1 \|	diff2 \|	blob \| history
drivers/video/cfb_console.c	diff1 \|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history
include/configs/CATcenter.h	diff1 \|	diff2 \|	blob \| history
include/configs/KAREF.h	diff1 \|	diff2 \|	blob \| history
include/configs/METROBOX.h	diff1 \|	diff2 \|	blob \| history
include/configs/MIP405.h	diff1 \|	diff2 \|	blob \| history
include/configs/PMC440.h	diff1 \|	diff2 \|	blob \| history
include/configs/XPEDITE1000.h	diff1 \|	diff2 \|	blob \| history
include/configs/acadia.h	diff1 \|	diff2 \|	blob \| history
include/configs/alpr.h	diff1 \|	diff2 \|	blob \| history
include/configs/hcu5.h	diff1 \|	diff2 \|	blob \| history
include/configs/icon.h	diff1 \|	diff2 \|	blob \| history
include/configs/katmai.h	diff1 \|	diff2 \|	blob \| history
include/configs/kilauea.h	diff1 \|	diff2 \|	blob \| history
include/configs/korat.h	diff1 \|	diff2 \|	blob \| history
include/configs/lwmon5.h	diff1 \|	diff2 \|	blob \| history
include/configs/makalu.h	diff1 \|	diff2 \|	blob \| history
include/configs/mcu25.h	diff1 \|	diff2 \|	blob \| history
include/configs/ocotea.h	diff1 \|	diff2 \|	blob \| history
include/configs/redwood.h	diff1 \|	diff2 \|	blob \| history
include/configs/sequoia.h	diff1 \|	diff2 \|	blob \| history
include/configs/taishan.h	diff1 \|	diff2 \|	blob \| history
include/configs/yucca.h	diff1 \|	diff2 \|	blob \| history
include/configs/zeus.h	diff1 \|	diff2 \|	blob \| history