git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

projects / u-boot / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b59b16c 360fe71)

author	Wolfgang Denk <wd@denx.de>
	Sat, 18 Oct 2008 19:59:44 +0000 (21:59 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Sat, 18 Oct 2008 19:59:44 +0000 (21:59 +0200)
commit	f82642e33899766892499b163e60560fbbf87773
tree	ab90f076f18e56b2b3e8c9375b95917daa78c1d9	tree \| snapshot
parent	b59b16ca24bc7e77ec113021a6d77b9b32fcf192	commit \| diff
parent	360fe71e82b83e264c964c9447c537e9a1f643c8	commit \| diff

Merge 'next' branch

Conflicts:

board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h

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

Makefile	diff1 \|	diff2 \|	blob \| history
cpu/mpc83xx/start.S	diff1 \|	diff2 \|	blob \| history
cpu/mpc85xx/speed.c	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/44x_spd_ddr2.c	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/immap_85xx.h	diff1 \|	diff2 \|	blob \| history

Cloned from git://git.denx.de/u-boot.git