]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'drivers-x86/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:26:06 +0000 (16:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:26:06 +0000 (16:26 +1000)
commitfcc540ec891bf5e921de7ad8aa35b67252528e66
tree1571c363d188a05a5ae6b40abc0efc7a4dbc1b13
parentdbe7d2e5856c7a6fedc0c3626f2152e6d490c516
parent507cf5a2f1e2cd32feaee6e931e18dd74cfe60ce
Merge remote-tracking branch 'drivers-x86/for-next'

# Conflicts:
# MAINTAINERS
# drivers/platform/x86/thinkpad_acpi.c
Documentation/userspace-api/ioctl/ioctl-number.rst
MAINTAINERS