Merge branch 'linus' into sched/core, to pick up fixes

author Ingo Molnar <mingo@kernel.org>

Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)

committer Ingo Molnar <mingo@kernel.org>

Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)
author Ingo Molnar <mingo@kernel.org>
Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)
committer Ingo Molnar <mingo@kernel.org>
Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)
diff --cc block/blk-mq.c
Simple merge
diff --cc fs/dax.c
Simple merge
diff --cc sound/core/pcm_lib.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)
		1	2
block/blk-mq.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/dax.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_lib.c	patch \|	diff1 \|	diff2 \|	blob \| history