]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of http://www.denx.de/git/u-boot
authorJon Loeliger <jdl@freescale.com>
Tue, 19 Sep 2006 13:51:24 +0000 (08:51 -0500)
committerJon Loeliger <jdl@freescale.com>
Tue, 19 Sep 2006 13:51:24 +0000 (08:51 -0500)
commitafa98843e4665add11b69496341053b268156e3a
tree116878b6b94920a5f282d0a16e4b9ad9dfaf57ff
parentb440d0ef72e6278973d3220c10136a4c0624c286
parentaeec782b020930732eab075af97212c3f03afcae
Merge branch 'master' of http://www.denx.de/git/u-boot

Conflicts:

board/stxxtc/Makefile
14 files changed:
MAINTAINERS
Makefile
README
board/cds/mpc8541cds/Makefile
board/cds/mpc8548cds/Makefile
board/cds/mpc8555cds/Makefile
board/stxxtc/Makefile
common/Makefile
drivers/Makefile
include/asm-ppc/processor.h
include/asm-ppc/u-boot.h
include/common.h
lib_ppc/board.c
tools/mkimage.c