diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-29 10:29:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-29 10:29:21 -0700 |
commit | 62a75b99ad3595c8b92eb584dd61a93f5a0e8828 (patch) | |
tree | af76a1103af9b3ef56d3ee22365ca388cecee303 /arch/x86/lib/csum-wrappers_64.c | |
parent | Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent (diff) | |
download | linux-dev-62a75b99ad3595c8b92eb584dd61a93f5a0e8828.tar.xz linux-dev-62a75b99ad3595c8b92eb584dd61a93f5a0e8828.zip |
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
Diffstat (limited to 'arch/x86/lib/csum-wrappers_64.c')
0 files changed, 0 insertions, 0 deletions