From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Apr 2013 22:56:57 +0000 (-0700)
Subject: Merge tag 'trace-fixes-3.9-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.9-rc7~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9baba6660bb616ca6272314a62febe8f6726ad30;p=~emulex%2Finfiniband.git

Merge tag 'trace-fixes-3.9-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Namhyung Kim fixed a long standing bug that can cause a kernel panic.

  If the function profiler fails to allocate memory for everything, it
  will do a double free on the same pointer which can cause a panic"

* tag 'trace-fixes-3.9-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix double free when function profile init failed
---

9baba6660bb616ca6272314a62febe8f6726ad30