From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 13 May 2015 06:20:18 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.1-rc4~19^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a50750d4dc577c8a49a1eaa8e50727513a0c9c05;p=linux.git

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

a50750d4dc577c8a49a1eaa8e50727513a0c9c05