Merge branch 'master' into for-4.20/upstream-fixes
Pull in a merge commit that brought in 3b692c55 ("HID: asus: only support backlight when it's not driven by WMI") so that fixup could be applied on top of it.
Showing
- .clang-format 0 additions, 1 deletion.clang-format
- .mailmap 12 additions, 0 deletions.mailmap
- Documentation/ABI/stable/sysfs-driver-usb-usbtmc 0 additions, 35 deletionsDocumentation/ABI/stable/sysfs-driver-usb-usbtmc
- Documentation/ABI/testing/configfs-stp-policy-p_sys-t 41 additions, 0 deletionsDocumentation/ABI/testing/configfs-stp-policy-p_sys-t
- Documentation/ABI/testing/configfs-usb-gadget-uvc 24 additions, 0 deletionsDocumentation/ABI/testing/configfs-usb-gadget-uvc
- Documentation/ABI/testing/sysfs-bus-iio 1 addition, 1 deletionDocumentation/ABI/testing/sysfs-bus-iio
- Documentation/ABI/testing/sysfs-bus-pci 24 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-pci
- Documentation/ABI/testing/sysfs-bus-usb 18 additions, 1 deletionDocumentation/ABI/testing/sysfs-bus-usb
- Documentation/ABI/testing/sysfs-bus-vmbus 21 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-vmbus
- Documentation/ABI/testing/sysfs-class-net 18 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-net
- Documentation/ABI/testing/sysfs-platform-lg-laptop 35 additions, 0 deletionsDocumentation/ABI/testing/sysfs-platform-lg-laptop
- Documentation/PCI/endpoint/pci-test-howto.txt 11 additions, 8 deletionsDocumentation/PCI/endpoint/pci-test-howto.txt
- Documentation/PCI/pci-error-recovery.txt 10 additions, 25 deletionsDocumentation/PCI/pci-error-recovery.txt
- Documentation/accounting/psi.txt 73 additions, 0 deletionsDocumentation/accounting/psi.txt
- Documentation/admin-guide/cgroup-v2.rst 22 additions, 0 deletionsDocumentation/admin-guide/cgroup-v2.rst
- Documentation/admin-guide/kernel-parameters.txt 27 additions, 2 deletionsDocumentation/admin-guide/kernel-parameters.txt
- Documentation/admin-guide/mm/memory-hotplug.rst 41 additions, 1 deletionDocumentation/admin-guide/mm/memory-hotplug.rst
- Documentation/admin-guide/security-bugs.rst 29 additions, 18 deletionsDocumentation/admin-guide/security-bugs.rst
- Documentation/arm/Samsung/Bootloader-interface.txt 1 addition, 0 deletionsDocumentation/arm/Samsung/Bootloader-interface.txt
- Documentation/cgroup-v1/rdma.txt 1 addition, 1 deletionDocumentation/cgroup-v1/rdma.txt
Loading
Please register or sign in to comment