Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core