From: Linus Torvalds <torvalds@linux-foundation.org>
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: firefly_0821_release~3680^2~3710
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./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