Merge branch 'master' of dh09.lee@10.89.53.95:/pub/git/u-boot-s5pc1xx

diff --combined board/samsung/universal_c110/universal.c
index 16ad2bd,5d72c57..5f0e389
--- 1/board/samsung/universal_c110/universal.c
--- 2/board/samsung/universal_c110/universal.c
+++ b/board/samsung/universal_c110/universal.c
@@@ -450,11 -450,12 +450,12 @@@ static char *display_features(int board
                        if (hwrevision(9)) {
                                name = "Kessler";
                        } else {
-                               name = "SLP SDK";
                                if (hwrevision(3))
-                                       strcat(name, " 4.3inch");
+                                       name = "SLP SDK 4.3inch";
                                else if (hwrevision(4))
-                                       strcat(name, " 4.5inch");
+                                       name = "SLP SDK 4.5inch";
+                               else
+                                       name = "SLP SDK";
                        }
                }
                if (board_rev & S1_BOARD)
@@@ -2562,10 -2563,6 +2563,10 @@@ int misc_init_r(void
        /* check fsa9480 */
        check_micro_usb(0);
  
 +#ifdef CONFIG_INFO_ACTION
 +      info_action_check();
 +#endif
 +
        return 0;
  }
  #endif