Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Aug 2009 18:23:43 +0000 (11:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Aug 2009 18:23:43 +0000 (11:23 -0700)
commit7d63e6359a2e86cd6335337de99354ab07680c55
tree8d33df8863b171a88508868c6670e0a553e44a30
parent9f459fadbb38abe68aa342f533ca17d8d90d6f2e
parent4a683bf94b8a10e2bb0da07aec3ac0a55e5de61f
Merge branch 'tracing-fixes-for-linus' of git://git./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/*
init/main.c