Merge with /home/stefan/git/u-boot/u-boot-ppc4xx

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

diff --cc include/configs/lwmon5.h
index 14a200d,7116c49..cf8ff45
--- 1/include/configs/lwmon5.h
--- 2/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@@ -34,9 -34,7 +34,8 @@@
  #define CONFIG_SYS_CLK_FREQ   33300000        /* external freq to pll */
  
  #define CONFIG_BOARD_EARLY_INIT_F 1   /* Call board_early_init_f      */
 +#define CONFIG_BOARD_POSTCLK_INIT 1   /* Call board_postclk_init      */
  #define CONFIG_MISC_INIT_R    1       /* Call misc_init_r             */
- #define CONFIG_ADD_RAM_INFO   1       /* Print additional info        */
  
  /*-----------------------------------------------------------------------
   * Base addresses -- Note these are effective addresses where the