Merge branch 'linus' into sched/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 24 Jun 2017 06:57:20 +0000 (08:57 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
block/blk-mq.c
fs/dax.c
sound/core/pcm_lib.c

diff --cc block/blk-mq.c
Simple merge
diff --cc fs/dax.c
Simple merge
Simple merge