diff options
author | Dave Airlie <airlied@redhat.com> | 2019-11-13 20:53:10 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-11-13 20:53:10 +0100 |
commit | 77e0723bd27f830d0903225372aa778fe2975648 (patch) | |
tree | 4c035783e014b3a0ac9174390f88dc75150533e4 /drivers/hid/hid-retrode.c | |
parent | Merge tag 'drm-misc-next-fixes-2019-11-06' of git://anongit.freedesktop.org/d... (diff) | |
parent | Linux 5.4-rc7 (diff) | |
download | linux-77e0723bd27f830d0903225372aa778fe2975648.tar.xz linux-77e0723bd27f830d0903225372aa778fe2975648.zip |
Merge v5.4-rc7 into drm-next
We have the i915 security fixes to backmerge, but first
let's clear the decks for other drivers to avoid a bigger
mess.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/hid/hid-retrode.c')
0 files changed, 0 insertions, 0 deletions