git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ecf1f01
b8a2162
)
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file...
author
Ingo Molnar
<mingo@kernel.org>
Wed, 6 Nov 2013 06:50:37 +0000
(07:50 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 6 Nov 2013 06:50:37 +0000
(07:50 +0100)
Conflicts:
kernel/Makefile
There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff