From: Linus Torvalds Date: Sun, 15 Jan 2012 01:59:02 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... X-Git-Tag: v3.3-rc1~58 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c;p=people%2Froyger%2Flinux.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig: kconfig/streamline-config.pl: Fix parsing Makefile with variables kconfig/streamline-config.pl: Simplify backslash line concatination --- 1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c