diff options
author | Dave Airlie <airlied@redhat.com> | 2020-09-08 06:41:40 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-09-08 06:41:40 +0200 |
commit | ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch) | |
tree | 3a54614d597b7b92ada36c5ea26dc994216b628b /tools/usb/Build | |
parent | Merge tag 'drm-intel-next-2020-08-24-1' of git://anongit.freedesktop.org/drm/... (diff) | |
parent | Linux 5.9-rc4 (diff) | |
download | linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.xz linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.zip |
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/usb/Build')
-rw-r--r-- | tools/usb/Build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/usb/Build b/tools/usb/Build new file mode 100644 index 000000000000..2ad6f9745816 --- /dev/null +++ b/tools/usb/Build @@ -0,0 +1,2 @@ +testusb-y += testusb.o +ffs-test-y += ffs-test.o |