git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bfa687
d0e639c
)
Merge tag 'v3.12-rc4' into sched/core
author
Ingo Molnar
<mingo@kernel.org>
Wed, 9 Oct 2013 10:36:13 +0000
(12:36 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 9 Oct 2013 10:36:13 +0000
(12:36 +0200)
Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.
Conflicts:
arch/avr32/include/asm/Kbuild
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff