Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: restore arch/{ppc/xtensa}/boot cflags
  kconfig: set title bar in xconfig
  kbuild: fix toplevel Makefile/depmod

1 files changed, 4 insertions, 0 deletions

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index e4eeb59a8c24..b9bb32dfd628 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1274,8 +1274,12 @@ ConfigMainWindow::ConfigMainWindow(void)
         QMenuBar* menu;
         bool ok;
         int x, y, width, height;
+        char title[256];
 
         QWidget *d = configApp->desktop();
+        snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
+                getenv("KERNELVERSION"));
+        setCaption(title);
 
         width = configSettings->readNumEntry("/window width", d->width() - 64);
         height = configSettings->readNumEntry("/window height", d->height() - 64);