From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 May 2013 17:46:55 +0000 (-0700)
Subject: Merge tag 'trace-fixes-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.10-rc3~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17fdfd0851617b6c18c0913364caf2a54171ce85;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'trace-fixes-v3.10-rc2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Masami Hiramatsu fixed another bug.  This time returning a proper
  result in event_enable_func().  After checking the return status of
  try_module_get(), it returned the status of try_module_get().

  But try_module_get() returns 0 on failure, which is success for
  event_enable_func()"

* tag 'trace-fixes-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Return -EBUSY when event_enable_func() fails to get module
---

17fdfd0851617b6c18c0913364caf2a54171ce85