tree 7f9dc872e8df1e332c9bfc198179a6d28e968c72
parent d2bac6ab932a407008a95d1993702f0a92f8f35e
parent 2e64694de21a812d637dcbea4471ad1f7897b049
author Linus Torvalds <torvalds@linux-foundation.org> 1325207356 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325207356 -0800

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

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix raw_spin_unlock_irqrestore() usage
  oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue