Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 13 May 2015 06:20:18 +0000 (08:20 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 13 May 2015 06:20:18 +0000 (08:20 +0200)
commita50750d4dc577c8a49a1eaa8e50727513a0c9c05
tree3fb966987c51f21b04a7bf60ee5c0b97f437b57c
parent44b11fee51711ca85aa2b121a49bf029d18a3722
parent466c1eb07f42bd27825af24d86b46d05e5e350b9
Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  - Use getconf to determine number of online CPUs,
    fixing the build on ARM (Will Deacon)

  - Fix tools/vm build (Andi Kleen).

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>