]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit95413f7b98aaba80cc3c26696330cfe1c140c3de
tree594366f7c9e9ab8a54d2b82121c8802b1950ead6
parent4669ce8ab98408f3874414f1507b437a2a1b0ab2
parent96e2e0cd4aa9c3665dfb6bc8cfec757b773cc137
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