Merge branch 'perf/urgent' into perf/core
authorFrederic Weisbecker <fweisbec@gmail.com>
Fri, 27 Aug 2010 00:28:40 +0000 (02:28 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Fri, 27 Aug 2010 00:30:07 +0000 (02:30 +0200)
commit98ee74a75ca0f047e75400afa712f7bf08268b8e
treec87b267f1e279173696f2294b3930940f1a5b570
parent7de5d895b2020260190db0021de646f3f22f755e
parent5225c45899e872383ca39f5533d28ec63c54b39e
Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/util/callchain.h

Merge reason:
Fix a non-trivial conflict with latest fixes
tools/perf/util/callchain.h