Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2012 01:59:02 +0000 (17:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2012 01:59:02 +0000 (17:59 -0800)
commit1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c
tree594366f7c9e9ab8a54d2b82121c8802b1950ead6
parent51be08419dc86c72486ac556aa39bc01026a403d
parent364212fddaaa60c5a64f67a0f5624ad996ecc8a0
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