git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7de5d89 5225c45)
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)
Conflicts:
tools/perf/util/callchain.h

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


Trivial merge
Pandora Kernel Repository