Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Aug 2010 11:09:58 +0000 (13:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Aug 2010 11:10:00 +0000 (13:10 +0200)
commit7de5d895b2020260190db0021de646f3f22f755e
tree51d012f0b76a2ec1bd3b4837690faf1087f37056
parent04fba67163a9e6132614b72b33bb2743bd33ffb3
parent502adf5778f4151dcba3f64dd6ed322151f3712c
Merge branch 'linus' into perf/core

Merge reason: pick up perf fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/Makefile
tools/perf/feature-tests.mak