From: Linus Torvalds 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: firefly_0821_release~3680^2~2541 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=62a75b99ad3595c8b92eb584dd61a93f5a0e8828;p=firefly-linux-kernel-4.4.55.git 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 --- 62a75b99ad3595c8b92eb584dd61a93f5a0e8828