git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be1e4e7
5cb480f
)
Merge branch 'linus' into sched/core, to resolve conflicts
author
Ingo Molnar
<mingo@kernel.org>
Sun, 2 Feb 2014 08:45:39 +0000
(09:45 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Sun, 2 Feb 2014 08:45:39 +0000
(09:45 +0100)
Conflicts:
kernel/sysctl.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff