Merge branch 'perf-tools-for-linus' of git://github.com/acmel/linux