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

Documentation/DocBook/media/v4l/media-types.xml

Documentation/watchdog/watchdog-parameters.txt

MAINTAINERS

Makefile

arch/arm/boot/compressed/Makefile

arch/arm/boot/dts/r8a7791-porter.dts

arch/arm/kernel/Makefile

arch/arm/kvm/guest.c

arch/arm/mm/pageattr.c

arch/arm64/include/asm/pgtable.h

arch/arm64/kernel/sleep.S

arch/arm64/kvm/guest.c

arch/arm64/mm/init.c

arch/mips/jz4740/gpio.c

arch/mips/kernel/r2300_fpu.S

arch/mips/kernel/r4k_fpu.S

arch/mips/kernel/traps.c

arch/mips/kvm/mips.c

arch/mips/mm/sc-mips.c

arch/parisc/include/asm/floppy.h