tree 42c440668586a0a7d7a5aaaaaf0e2b543e2bbc2a
parent 17d30ac077df253c12c7ba4db8d5cdacfceeb6d1
parent 17431928194b36a0f88082df875e2e036da7fddf
author Linus Torvalds <torvalds@linux-foundation.org> 1275236023 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275236023 -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: Hide error output in find command in streamline_config.pl
  kconfig: Fix typo in comment in streamline_config.pl
  kconfig: Make a variable local in streamline_config.pl