git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f0ab40 a724ead)
Merge commit 'linus/master' into tracing/kprobes
authorFrederic Weisbecker <fweisbec@gmail.com>
Wed, 23 Sep 2009 21:08:43 +0000 (23:08 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Wed, 23 Sep 2009 21:08:43 +0000 (23:08 +0200)
Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c

Merge reason:
Sync with latest significant tracing core changes.


Trivial merge
Pandora Kernel Repository