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

diff --combined include/common.h
index 3b5bd8c52dbd12c3ef502cca1120cfb92122e0c4,169bd2cd949fc2951a657e4aabae68ed97560e2e..9ef93444125c458a8e602db73f97313857fd94f1
--- 1/include/common.h
--- 2/include/common.h
+++ b/include/common.h
@@@ -197,8 -197,6 +197,8 @@@ int        print_buffer (ulong addr, void* dat
  void  main_loop       (void);
  int   run_command     (const char *cmd, int flag);
  int   readline        (const char *const prompt);
 +int   readline_into_buffer    (const char *const prompt, char * buffer);
 +int   parse_line (char *, char *[]);
  void  init_cmd_timeout(void);
  void  reset_cmd_timeout(void);
  
@@@ -229,6 -227,7 +229,7 @@@ extern ulong load_addr;            /* Default Loa
  /* common/cmd_nvedit.c */
  int   env_init     (void);
  void  env_relocate (void);
+ int   envmatch     (uchar *, int);
  char  *getenv      (char *);
  int   getenv_r     (char *name, char *buf, unsigned len);
  int   saveenv      (void);
@@@ -280,6 -279,9 +281,9 @@@ int        misc_init_r   (void)
  /* common/exports.c */
  void  jumptable_init(void);
  
+ /* api/api.c */
+ void  api_init (void);
+ 
  /* common/memsize.c */
  long  get_ram_size  (volatile long *, long);