diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 14:23:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 14:23:43 -0400 |
| commit | 7d63e6359a2e86cd6335337de99354ab07680c55 (patch) | |
| tree | 8d33df8863b171a88508868c6670e0a553e44a30 /fs/nilfs2/the_nilfs.h | |
| parent | 9f459fadbb38abe68aa342f533ca17d8d90d6f2e (diff) | |
| parent | 4a683bf94b8a10e2bb0da07aec3ac0a55e5de61f (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Fix too large stack usage in do_one_initcall()
tracing: handle broken names in ftrace filter
ftrace: Unify effect of writing to trace_options and option/*
Diffstat (limited to 'fs/nilfs2/the_nilfs.h')
0 files changed, 0 insertions, 0 deletions