git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa7b694
5373db8
)
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
author
Ingo Molnar
<mingo@elte.hu>
Wed, 27 Apr 2011 08:38:30 +0000
(10:38 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 27 Apr 2011 08:40:21 +0000
(10:40 +0200)
Conflicts:
include/linux/perf_event.h
Merge reason: pick up the latest jump-label enhancements, they are cooked ready.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff