Merge 'next' branch

Conflicts:

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

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

diff --cc Makefile
Simple merge

diff --cc cpu/mpc83xx/start.S
index 6ff66826224230b9db6a2972560612597c147b4e,565cc3972b207c178ace438030ee1c7ed559283f..cd566b2d747d945d3f155adf77022c010a49b423
--- 1/cpu/mpc83xx/start.S
--- 2/cpu/mpc83xx/start.S
+++ b/cpu/mpc83xx/start.S
@@@ -167,21 -167,9 +167,21 @@@ boot_warm: /* time t 5 *
        /* Initialise the E300 processor core           */
        /*------------------------------------------*/
  
 +#ifdef CONFIG_NAND_SPL
 +      /* The FCM begins execution after only the first page
 +       * is loaded.  Wait for the rest before branching
 +       * to another flash page.
 +       */
 +      addi    r7, r3, 0x50b0
 +1:    dcbi    0, r7
 +      lwz     r6, 0(r7)
 +      andi.   r6, r6, 1
 +      beq     1b
 +#endif
 +
        bl      init_e300_core
  
- #ifdef CFG_FLASHBOOT
+ #ifdef CONFIG_SYS_FLASHBOOT
  
        /* Inflate flash location so it appears everywhere, calculate */
        /* the absolute address in final location of the FLASH, jump  */

diff --cc cpu/mpc85xx/speed.c
Simple merge

diff --cc cpu/ppc4xx/44x_spd_ddr2.c
Simple merge

diff --cc include/asm-ppc/immap_85xx.h
Simple merge