Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --combined include/common.h
index 01957e3d5fd2f882e30520c4728015be304c90c4,04195abcb9a4a2f6f3cb615ca3c2e205b7a675f1..22e80bb9b3aa3647c14bd043c99cc0543c736d12
--- 1/include/common.h
--- 2/include/common.h
+++ b/include/common.h
@@@ -129,20 -129,21 +129,21 @@@ typedef void (interrupt_handler_t)(voi
  
  /*
   * enable common handling for all TQM8xxL/M boards:
-  * - CONFIG_TQM8xxM will be defined for all TQM8xxM and TQM885D boards
+  * - CONFIG_TQM8xxM will be defined for all TQM8xxM boards
   * - CONFIG_TQM8xxL will be defined for all TQM8xxL _and_ TQM8xxM boards
+  *                  and for the TQM885D board
   */
  #if defined(CONFIG_TQM823M) || defined(CONFIG_TQM850M) || \
      defined(CONFIG_TQM855M) || defined(CONFIG_TQM860M) || \
-     defined(CONFIG_TQM862M) || defined(CONFIG_TQM866M) || \
-     defined(CONFIG_TQM885D)
+     defined(CONFIG_TQM862M) || defined(CONFIG_TQM866M)
  # ifndef CONFIG_TQM8xxM
  #  define CONFIG_TQM8xxM
  # endif
  #endif
  #if defined(CONFIG_TQM823L) || defined(CONFIG_TQM850L) || \
      defined(CONFIG_TQM855L) || defined(CONFIG_TQM860L) || \
-     defined(CONFIG_TQM862L) || defined(CONFIG_TQM8xxM)
+     defined(CONFIG_TQM862L) || defined(CONFIG_TQM8xxM) || \
+     defined(CONFIG_TQM885D)
  # ifndef CONFIG_TQM8xxL
  #  define CONFIG_TQM8xxL
  # endif
@@@ -497,7 -498,6 +498,7 @@@ ulong      get_bus_freq  (ulong)
  #if defined(CONFIG_MPC85xx)
  typedef MPC85xx_SYS_INFO sys_info_t;
  void  get_sys_info  ( sys_info_t * );
 +ulong get_ddr_freq  (ulong);
  #endif
  #if defined(CONFIG_MPC86xx)
  typedef MPC86xx_SYS_INFO sys_info_t;