]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd917b44e23b7a3cc2273d697c9d74fd2dad2f4fb
tree3fb966987c51f21b04a7bf60ee5c0b97f437b57c
parent931b4a1032c4b53b4365a40e74922ef3dfc294fe
parent39267afc97b7a670222b88e1d29647e5d86cb366
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>