Merge commit 'v2.6.35-rc3' into perf/core

Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.

2 files changed, 13 insertions, 13 deletions

diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index 616c60138183..dd8e587c50e2 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -180,7 +180,7 @@ do_resize:
                 case KEY_LEFT:
                         switch (button) {
                         case -1:
-                                button = 1;     /* Indicates "Cancel" button is selected */
+                                button = 1;     /* Indicates "Help" button is selected */
                                 print_buttons(dialog, height, width, 1);
                                 break;
                         case 0:
@@ -204,7 +204,7 @@ do_resize:
                                 print_buttons(dialog, height, width, 0);
                                 break;
                         case 0:
-                                button = 1;     /* Indicates "Cancel" button is selected */
+                                button = 1;     /* Indicates "Help" button is selected */
                                 print_buttons(dialog, height, width, 1);
                                 break;
                         case 1:
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index fa9d633f293c..1d604738fa13 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -383,6 +383,10 @@ do_resize:
                 case 'n':
                 case 'm':
                 case '/':
+                case 'h':
+                case '?':
+                case 'z':
+                case '\n':
                         /* save scroll info */
                         *s_scroll = scroll;
                         delwin(menu);
@@ -390,8 +394,10 @@ do_resize:
                         item_set(scroll + choice);
                         item_set_selected(1);
                         switch (key) {
+                        case 'h':
+                        case '?':
+                                return 2;
                         case 's':
-                                return 3;
                         case 'y':
                                 return 3;
                         case 'n':
@@ -402,18 +408,12 @@ do_resize:
                                 return 6;
                         case '/':
                                 return 7;
+                        case 'z':
+                                return 8;
+                        case '\n':
+                                return button;
                         }
                         return 0;
-                case 'h':
-                case '?':
-                        button = 2;
-                case '\n':
-                        *s_scroll = scroll;
-                        delwin(menu);
-                        delwin(dialog);
-                        item_set(scroll + choice);
-                        item_set_selected(1);
-                        return button;
                 case 'e':
                 case 'x':
                         key = KEY_ESC;