git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8c6e549
e041e32
)
Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for...
author
Ingo Molnar
<mingo@kernel.org>
Fri, 6 Jun 2014 05:55:06 +0000
(07:55 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Fri, 6 Jun 2014 05:55:06 +0000
(07:55 +0200)
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff