aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-14 17:59:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-14 17:59:02 -0800
commit1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c (patch)
tree594366f7c9e9ab8a54d2b82121c8802b1950ead6 /fs
parentMerge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 (diff)
parentkconfig/streamline-config.pl: Fix parsing Makefile with variables (diff)
downloadlinux-dev-1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c.tar.xz
linux-dev-1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c.zip
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions