Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jun 2012 17:29:21 +0000 (10:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jun 2012 17:29:21 +0000 (10:29 -0700)
commit62a75b99ad3595c8b92eb584dd61a93f5a0e8828
treeaf76a1103af9b3ef56d3ee22365ca388cecee303
parentefc9def8c7ab7ac8d44d8afb565247aa2b21cfd5
parent662f5cedb38c4b88e1cebfd54a88159f2f7ab7b9
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull oprofile fixlet from Ingo Molnar.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array