git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
12a81c8
eb703f9
)
Merge branch 'perf/nmi' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 5 Aug 2010 06:45:05 +0000
(08:45 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 5 Aug 2010 06:45:05 +0000
(08:45 +0200)
Conflicts:
kernel/Makefile
Merge reason: Add the now complete topic, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge