]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d8607c5 5330628)
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)
commite474c9d786683233e46d29b4e9f583ca7a0b184c
tree300f4226c87e6df403cda861ab6766b23d278f09tree | snapshot
parentd8607c56e4cf1f9ba27ea3b9b8974e05bd15b348commit | diff
parent5330628286e5b4bc8e9953169b5965ac106944bacommit | 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.