| commit | 62a75b99ad3595c8b92eb584dd61a93f5a0e8828 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 29 10:29:21 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 29 10:29:21 2012 -0700 |
| tree | af76a1103af9b3ef56d3ee22365ca388cecee303 | |
| parent | efc9def8c7ab7ac8d44d8afb565247aa2b21cfd5 [diff] | |
| parent | 662f5cedb38c4b88e1cebfd54a88159f2f7ab7b9 [diff] |
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