| commit | 1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 14 17:59:02 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 14 17:59:02 2012 -0800 |
| tree | 594366f7c9e9ab8a54d2b82121c8802b1950ead6 | |
| parent | 51be08419dc86c72486ac556aa39bc01026a403d [diff] | |
| parent | 364212fddaaa60c5a64f67a0f5624ad996ecc8a0 [diff] |
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