diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-12-11 10:35:37 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-12-11 11:13:50 +0200 |
| commit | 023265ed75d8792ca1d555430a8985511d3f8788 (patch) | |
| tree | 0940ba6f005f102062e5842b4ec8073ecd583ac0 /Documentation/filesystems/index.rst | |
| parent | 2b68392e638dfa5cf4f7b558f62e3ea4def2e605 (diff) | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a (diff) | |
| download | linux-023265ed75d8792ca1d555430a8985511d3f8788.tar.gz | |
Merge drm/drm-next into drm-intel-next-queued
Sync up with v5.5-rc1 to get the updated lock_release() API among other
things. Fix the conflict reported by Stephen Rothwell [1].
[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'Documentation/filesystems/index.rst')
| -rw-r--r-- | Documentation/filesystems/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/filesystems/index.rst b/Documentation/filesystems/index.rst index 2c3a9f761205..ad6315a48d14 100644 --- a/Documentation/filesystems/index.rst +++ b/Documentation/filesystems/index.rst @@ -46,4 +46,5 @@ Documentation for filesystem implementations. .. toctree:: :maxdepth: 2 + autofs virtiofs |