]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e538ea3 ffc47f0)
Merge branch 'WIP.sched/core' into sched/core
authorIngo Molnar <mingo@kernel.org>
Tue, 20 Jun 2017 10:28:21 +0000 (12:28 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 20 Jun 2017 10:28:21 +0000 (12:28 +0200)
commit298e2b56182ec88c41c46908af8f6cc22fc284f6
tree300f4226c87e6df403cda861ab6766b23d278f09tree | snapshot
parente538ea36094c4bff4847ed1eb6949548032c0f47commit | diff
parentffc47f053fd8c1fca504b9833f892b6366d6bf43commit | diff
Merge branch 'WIP.sched/core' into sched/core

 Conflicts:
kernel/sched/Makefile

Pick up the waitqueue related renames - it didn't get much feedback,
so it appears to be uncontroversial. Famous last words? ;-)

Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/iommu/of_iommu.c diff1 | diff2 | blob | history
kernel/printk/printk.c diff1 | diff2 | blob | history
kernel/sched/Makefile diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/fair.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.