tree eab66a18536e6db6f3e465619440d1141ca18ba4
parent 1840897ab5d39b2e510c610ee262ded79919e718
parent 8ef17fa2ef8be74b946e725c2afb0e2a54981da1
author Linus Torvalds <torvalds@linux-foundation.org> 1288388610 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288388610 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
  kconfig: Have streamline_config process menuconfigs too
  kconfig: Fix streamline_config to read multi line deps in Kconfig files
  kconfig: Fix missing declaration of variable $dir in streamline_config.pl
  kconfig: Fix variable name typo %prompts in streamline_config.pl
  kconfig: Make localmodconfig handle environment variables