Merge 'next' branch
authorWolfgang Denk <wd@denx.de>
Sat, 18 Oct 2008 19:59:44 +0000 (21:59 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 18 Oct 2008 19:59:44 +0000 (21:59 +0200)
commitf82642e33899766892499b163e60560fbbf87773
treeab90f076f18e56b2b3e8c9375b95917daa78c1d9
parentb59b16ca24bc7e77ec113021a6d77b9b32fcf192
parent360fe71e82b83e264c964c9447c537e9a1f643c8
Merge 'next' branch

Conflicts:

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

Signed-off-by: Wolfgang Denk <wd@denx.de>
Makefile
cpu/mpc83xx/start.S
cpu/mpc85xx/speed.c
cpu/ppc4xx/44x_spd_ddr2.c
include/asm-ppc/immap_85xx.h