tree c671e5a35103dc8a7d1ea4cdc0484bcc0e6f8e50
parent da4a22cba7cb2d922691214aed6b1977f04efaff
parent 818e3dd30a4ff34fff6d90e87ae59c73f6a53691
author Linus Torvalds <torvalds@linux-foundation.org> 1225736500 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1225736500 -0800

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing, ring-buffer: add paranoid checks for loops
  ftrace: use kretprobe trampoline name to test in output
  tracing, alpha: undefined reference to `save_stack_trace'