projects / platform / kernel / linux-rpi3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c5ae366 2055da9)
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)
commit902b31941327a0e9c0ca9eb7750414ae41bf8a89
tree300f4226c87e6df403cda861ab6766b23d278f09tree | snapshot
parentc5ae366e12b2bd56fc7d7e9d484836bec9ddc110commit | diff
parent2055da97389a605c8a00d163d40903afbe413921commit | 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
Domain: System / Kernel; Licenses: GPL-2.0;