git.ipfire.org Git - people/arne

]> git.ipfire.org Git - people/arne_f/kernel.git/commit

projects / people / arne_f / kernel.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 20 Jun 2017 10:28:21 +0000 (12:28 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 20 Jun 2017 10:28:21 +0000 (12:28 +0200)
commit	902b31941327a0e9c0ca9eb7750414ae41bf8a89
tree	300f4226c87e6df403cda861ab6766b23d278f09	tree \| snapshot
parent	c5ae366e12b2bd56fc7d7e9d484836bec9ddc110	commit \| diff
parent	2055da97389a605c8a00d163d40903afbe413921	commit \| 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

Arne's tree of linux kernel.

RSS Atom

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