Merge tag 'v4.10-rc6' into devel
Linux 4.10-rc6 Resolved conflicts in: drivers/pinctrl/pinctrl-amd.c drivers/pinctrl/samsung/pinctrl-exynos.c
Showing
- .mailmap 4 additions, 0 deletions.mailmap
- Documentation/ABI/testing/sysfs-devices-deferred_probe 0 additions, 12 deletionsDocumentation/ABI/testing/sysfs-devices-deferred_probe
- Documentation/admin-guide/kernel-parameters.txt 12 additions, 1 deletionDocumentation/admin-guide/kernel-parameters.txt
- Documentation/block/queue-sysfs.txt 3 additions, 3 deletionsDocumentation/block/queue-sysfs.txt
- Documentation/devicetree/bindings/i2c/i2c.txt 8 additions, 0 deletionsDocumentation/devicetree/bindings/i2c/i2c.txt
- Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt 3 additions, 1 deletion...entation/devicetree/bindings/input/tps65218-pwrbutton.txt
- Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt 3 additions, 0 deletions...ree/bindings/interrupt-controller/snps,archs-idu-intc.txt
- Documentation/devicetree/bindings/mtd/tango-nand.txt 3 additions, 3 deletionsDocumentation/devicetree/bindings/mtd/tango-nand.txt
- Documentation/devicetree/bindings/net/mediatek-net.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/mediatek-net.txt
- Documentation/devicetree/bindings/net/phy.txt 3 additions, 2 deletionsDocumentation/devicetree/bindings/net/phy.txt
- Documentation/devicetree/bindings/net/ti,dp83867.txt 4 additions, 2 deletionsDocumentation/devicetree/bindings/net/ti,dp83867.txt
- Documentation/devicetree/bindings/power/supply/tps65217_charger.txt 6 additions, 1 deletion...ion/devicetree/bindings/power/supply/tps65217_charger.txt
- Documentation/devicetree/bindings/spi/sh-msiof.txt 13 additions, 6 deletionsDocumentation/devicetree/bindings/spi/sh-msiof.txt
- Documentation/driver-api/infrastructure.rst 0 additions, 15 deletionsDocumentation/driver-api/infrastructure.rst
- Documentation/filesystems/proc.txt 3 additions, 2 deletionsDocumentation/filesystems/proc.txt
- Documentation/networking/mpls-sysctl.txt 2 additions, 2 deletionsDocumentation/networking/mpls-sysctl.txt
- Documentation/power/states.txt 1 addition, 3 deletionsDocumentation/power/states.txt
- Documentation/vfio-mediated-device.txt 15 additions, 12 deletionsDocumentation/vfio-mediated-device.txt
- Documentation/vm/page_frags 42 additions, 0 deletionsDocumentation/vm/page_frags
- MAINTAINERS 53 additions, 23 deletionsMAINTAINERS
Please register or sign in to comment