tree 3857996cf30ae6a60b5afe2e1e3e30f75fbca05e
parent 842c895d140a75e5d67fa346213deb3ca2b460f8
parent 5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1
author Linus Torvalds <torvalds@linux-foundation.org> 1307987149 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1307987149 -0700

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

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ftrace: Revert 8ab2b7efd ftrace: Remove unnecessary disabling of irqs
  kprobes/trace: Fix kprobe selftest for gcc 4.6
  ftrace: Fix possible undefined return code
  oprofile, dcookies: Fix possible circular locking dependency
  oprofile: Fix locking dependency in sync_start()
  oprofile: Free potentially owned tasks in case of errors
  oprofile, x86: Add comments to IBS LVT offset initialization