[GIT PULL] tracing fix for 2.6.31

[Frederic Weisbecker]

Ingo,

Please pull the following tracing fix for .31

Thanks,
Frederic.


The following changes since commit df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb:
  Linus Torvalds (1):
        Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git \
	tracing/urgent

Zhaolei (1):
      ftrace: Unify effect of writing to trace_options and option/*

 kernel/trace/trace.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

---