git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a2d063a
5538bec
)
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
author
Ingo Molnar
<mingo@elte.hu>
Sun, 22 May 2011 08:07:37 +0000
(10:07 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 22 May 2011 08:10:01 +0000
(10:10 +0200)
Conflicts:
tools/perf/builtin-top.c
Semantic conflict:
util/include/linux/list.h # fix prefetch.h removal fallout
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff