summaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2020-07-18 22:43:55 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2020-07-18 22:43:55 +1000
commitef9f7cfaa50025068c69cdee8efccee12d9fabfc (patch)
treeafe8211215c04bd85763e1e37b079c9ef0f0355e /drivers/uio
parent61f879d97ce4510dd29d676a20d67692e3b34806 (diff)
parentf0479c4bcbd92d1a457d4a43bcab79f29d11334a (diff)
downloadlinux-ef9f7cfaa50025068c69cdee8efccee12d9fabfc.tar.bz2
Merge branch 'fixes' into next
Merge our fixes branch, primarily to bring in the ebb selftests build fix and the pkey fix, which is a dependency for some future work.
Diffstat (limited to 'drivers/uio')
0 files changed, 0 insertions, 0 deletions