projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44b11fe 466c1eb)
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)
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>

Trivial merge
John Crispins staging tree