git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da5cabf
1aa54bc
)
Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Steven Rostedt
<srostedt@redhat.com>
Mon, 16 Aug 2010 15:17:30 +0000
(11:17 -0400)
committer
Steven Rostedt
<rostedt@goodmis.org>
Mon, 16 Aug 2010 15:17:30 +0000
(11:17 -0400)
Conflicts:
kernel/trace/trace_events.c
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff