From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Jun 2012 17:29:21 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.5-rc5~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=62a75b99ad3595c8b92eb584dd61a93f5a0e8828;p=linux.git

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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
---

62a75b99ad3595c8b92eb584dd61a93f5a0e8828