summaryrefslogtreecommitdiff
path: root/arch/arm/include/uapi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-11 10:11:26 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-11 10:11:26 +0300
commita66a7d48f34a253429999dcc7188f607cd7a206a (patch)
treec8f135f000b000f59dd171eb51b850d9374f8f9c /arch/arm/include/uapi
parent841081d89d5adf96759f2df50185de950f5d8694 (diff)
parent7c53f6b671f4aba70ff15e1b05148b10d58c2837 (diff)
downloadlinux-a66a7d48f34a253429999dcc7188f607cd7a206a.tar.xz
Merge 5.11-rc3 into usb-next
Resolves a merge issue in: drivers/usb/dwc3/gadget.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/include/uapi')
0 files changed, 0 insertions, 0 deletions