git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
960d447
c46a024
)
Merge branch 'linus' into sched/core, to resolve conflict
author
Ingo Molnar
<mingo@kernel.org>
Tue, 2 Jun 2015 06:05:42 +0000
(08:05 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Tue, 2 Jun 2015 06:05:42 +0000
(08:05 +0200)
Conflicts:
arch/sparc/include/asm/topology_64.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff