diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 02:59:02 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 02:59:02 +0100 |
commit | 1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c (patch) | |
tree | 594366f7c9e9ab8a54d2b82121c8802b1950ead6 /fs/notify/mark.c | |
parent | Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 (diff) | |
parent | kconfig/streamline-config.pl: Fix parsing Makefile with variables (diff) | |
download | linux-1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c.tar.xz linux-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/notify/mark.c')
0 files changed, 0 insertions, 0 deletions