From: Linus Torvalds Date: Sun, 30 May 2010 16:13:43 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... X-Git-Tag: v2.6.35-rc1~6 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=092405cdb66f060918160ae730640b449ed7b827 Merge branch 'for-linus' of git://git./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 --- 092405cdb66f060918160ae730640b449ed7b827