2.6.25-git10

diff --git a/Makefile b/Makefile
index 39516bf..6a86012 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 25
-EXTRAVERSION =
+EXTRAVERSION = -git10
 NAME = Funky Weasel is Jiggy wit it
 
 # *DOCUMENTATION*
@@ -507,6 +507,10 @@ else
 KBUILD_CFLAGS   += -O2
 endif
 
+ifneq (CONFIG_FRAME_WARN,0)
+KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
+endif
+
 # Force gcc to behave correct even for buggy distributions
 # Arch Makefiles may override this setting
 KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
@@ -1396,7 +1400,7 @@ define xtags
        $(all-kconfigs) | xargs $1 -a \
       --langdef=kconfig \
       --language-force=kconfig \
-      --regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \
+      --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'; \
        $(all-defconfigs) | xargs -r $1 -a \
       --langdef=dotconfig \
       --language-force=dotconfig \
@@ -1404,7 +1408,7 @@ define xtags
    elif $1 --version 2>&1 | grep -iq emacs; then \
        $(all-sources) | xargs $1 -a; \
        $(all-kconfigs) | xargs $1 -a \
-      --regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \
+      --regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \
        $(all-defconfigs) | xargs -r $1 -a \
       --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
    else \
@@ -1538,8 +1542,7 @@ quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN   $(wildcard $(rm-dirs)))
 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files)))
       cmd_rmfiles = rm -f $(rm-files)
 
-# Run depmod only is we have System.map and depmod is executable
-# and we build for the host arch
+# Run depmod only if we have System.map and depmod is executable
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
       cmd_depmod = \
    if [ -r System.map -a -x $(DEPMOD) ]; then                              \