From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2009 02:58:10 +0000 (-0700)
Subject: Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.31-rc1~400
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d;p=pandora-kernel.git

Merge branch 'tracing-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  function-graph: always initialize task ret_stack
  function-graph: move initialization of new tasks up in fork
  function-graph: add memory barriers for accessing task's ret_stack
  function-graph: enable the stack after initialization of other variables
  function-graph: only allocate init tasks if it was not already done

Manually fix trivial conflict in kernel/trace/ftrace.c
---

991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d
Reading git-diff-tree failed