Merge remote-tracking branch 'djwong/ocfs2-vfs-reflink-6' into for-linus

CREDITS

Documentation/devicetree/bindings/net/ethernet.txt

Documentation/networking/nf_conntrack-sysctl.txt

MAINTAINERS

Makefile

arch/arc/include/asm/delay.h

arch/arc/include/asm/pgtable.h

arch/arc/mm/cache.c

arch/arm/boot/dts/Makefile

arch/arm/boot/dts/stih407-family.dtsi

arch/arm/boot/dts/sun5i-gr8-evb.dts

arch/arm/boot/dts/sun5i-gr8.dtsi

arch/arm64/boot/dts/arm/juno-base.dtsi

arch/arm64/boot/dts/arm/juno-r1.dts

arch/arm64/boot/dts/arm/juno-r2.dts

arch/arm64/boot/dts/arm/juno.dts

drivers/ata/ahci.c

drivers/ata/libata-scsi.c

drivers/block/zram/zram_drv.c

drivers/clk/bcm/Kconfig