git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dca2d6a f39cdf2)
Merge commit 'perf/core' into perf/hw-breakpoint
authorFrederic Weisbecker <fweisbec@gmail.com>
Sat, 17 Oct 2009 23:09:09 +0000 (01:09 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Sat, 17 Oct 2009 23:12:33 +0000 (01:12 +0200)
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.


Trivial merge
Pandora Kernel Repository