tree c87b267f1e279173696f2294b3930940f1a5b570
parent 7de5d895b2020260190db0021de646f3f22f755e
parent 5225c45899e872383ca39f5533d28ec63c54b39e
author Frederic Weisbecker <fweisbec@gmail.com> 1282868920 +0200
committer Frederic Weisbecker <fweisbec@gmail.com> 1282869007 +0200

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/callchain.h

Merge reason:
	Fix a non-trivial conflict with latest fixes