diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-01-06 12:35:33 +0300 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-01-06 12:35:33 +0300 |
commit | 22164fbe274c2dd96d2887fe121896d321000a61 (patch) | |
tree | 629a8af05ecbe3ed8e18938de2564517c9b44d92 /drivers/infiniband/core/security.c | |
parent | 3d0dad869aeb5d8e81985c73a6c73428258f8083 (diff) | |
parent | f5c547efa16c0ea5abff0596e829f502be11902e (diff) | |
download | linux-22164fbe274c2dd96d2887fe121896d321000a61.tar.xz |
Merge drm/drm-next into drm-misc-next
Requested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/infiniband/core/security.c')
0 files changed, 0 insertions, 0 deletions