aboutsummaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorVinod Koul2020-08-07 11:13:37 +0530
committerVinod Koul2020-08-07 11:13:37 +0530
commit00043a2689232631f39ebbf6719d545b1d799086 (patch)
tree0660e8e30210547562ad9132be0255b795453d73 /include/uapi
parent0b5ad7b9522e6172342511fac6114fd8b7eb622a (diff)
parentbc227385eb71f2cb453efeddc053265bbd2525f9 (diff)
Merge branch 'topic/xilinx' into fixes
Conflicts: Documentation/driver-api/dmaengine/provider.rst include/linux/dmaengine.h
Diffstat (limited to 'include/uapi')
0 files changed, 0 insertions, 0 deletions