summaryrefslogtreecommitdiff
path: root/Documentation/filesystems/locks.rst
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2020-08-04 14:02:54 +0300
committerKalle Valo <kvalo@codeaurora.org>2020-08-04 14:02:54 +0300
commit2cfd71f1a43e9e1053db6c84f2dc33fe88128f67 (patch)
tree777ad43d30e00597687256da0d5a1f966df99f3e /Documentation/filesystems/locks.rst
parent3dc05ffb04436020f63138186dbc4f37bd938552 (diff)
parent1cfd3426ef989b83fa6176490a38777057e57f6c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
mt76 driver had major conflicts within mt7615 directory. To make it easier for every merge wireless-drivers to wireless-drivers-next and solve those conflicts.
Diffstat (limited to 'Documentation/filesystems/locks.rst')
0 files changed, 0 insertions, 0 deletions