commit 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jun 10 19:58:10 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jun 10 19:58:10 2009 -0700
tree 50b5f4e2b9f138da57f76eca44fdcc80a2fcd428
parent 862366118026a358882eefc70238dbcc3db37aac
parent 84047e360af0394ac5861d433f26bbcf30f77dd1

Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/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