Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Dec 2011 01:09:16 +0000 (17:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Dec 2011 01:09:16 +0000 (17:09 -0800)
commit7578ed02e4b08c9b7b07443b44cf0ccfdf55c91e
tree7f9dc872e8df1e332c9bfc198179a6d28e968c72
parentd2bac6ab932a407008a95d1993702f0a92f8f35e
parent2e64694de21a812d637dcbea4471ad1f7897b049
Merge branch 'perf-urgent-for-linus' of git://git./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